summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'maint'Chris St. Pierre2013-11-128-17/+37
|\ | | | | | | | | | | | | | | | | Conflicts: src/lib/Bcfg2/Server/Admin/Reports.py src/lib/Bcfg2/Server/Hostbase/hostbase/urls.py src/lib/Bcfg2/Server/Hostbase/urls.py src/sbin/bcfg2-crypt tools/upgrade/1.3/migrate_dbstats.py
| * bcfg2-crypt: Fixed variable name collisionChris St. Pierre2013-11-121-3/+3
| |
| * bcfg2-crypt: backported fixes in b5b26415161e715fe4d22d69328b06801ff7124dChris St. Pierre2013-11-121-22/+25
| |
| * Reports: Add missing ImportErrorSol Jerome2013-11-111-1/+1
| | | | | | | | Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
| * Fix compatibility with Django 1.6.Simon Ruderich2013-11-119-16/+37
| |
* | Options: made unit test flag publicChris St. Pierre2013-11-122-4/+4
| |
* | Multiprocessing: Added missing Queue back in, merge failChris St. Pierre2013-11-121-1/+1
| |
* | bcfg2-crypt: Avoid duplicate decrypt/encrypt when auto-determining modeChris St. Pierre2013-11-121-5/+7
| |
* | bcfg2-crypt: Fixed several bugs in autodetection of encrypt/decrypt modeChris St. Pierre2013-11-121-41/+58
| |
* | testsuite: Wrote bcfg2-crypt end-to-end testsChris St. Pierre2013-11-1213-0/+485
| |
* | Options: added workaround for unit tests that use the parserChris St. Pierre2013-11-122-13/+15
| |
* | Merge branch 'maint'Chris St. Pierre2013-11-1124-70/+150
|\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/lib/Bcfg2/Server/Admin/Compare.py src/lib/Bcfg2/Server/Admin/Snapshots.py src/lib/Bcfg2/Server/MultiprocessingCore.py src/lib/Bcfg2/Server/Plugins/Probes.py src/sbin/bcfg2-crypt src/sbin/bcfg2-reports tools/upgrade/1.3/migrate_configs.py tools/upgrade/1.3/migrate_perms_to_mode.py
| * bcfg2-crypt: fixed missing EVPErrorChris St. Pierre2013-11-111-2/+1
| |
| * bcfg2-crypt: better debugging, error handling with Properties filesChris St. Pierre2013-11-111-3/+37
| |
| * bcfg2-crypt: fixed completely backwards logicChris St. Pierre2013-11-111-1/+1
| |
| * Probes: automatically remove duplicate probe dataChris St. Pierre2013-11-111-3/+10
| |
| * doc: Add another level to our contents pageSol Jerome2013-11-081-1/+1
| | | | | | | | | | | | | | Requested by rudi_s on IRC to aid in navigation (especially for new users). Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
| * tools: skip ignored files (e.g., .svn) in migrate_perms_to_mode (from Matt ↵Chris St. Pierre2013-11-081-1/+14
| | | | | | | | Baker)
| * tools: fix incorrect reference to config file in migrate_configs.py (from ↵Chris St. Pierre2013-11-081-4/+4
| | | | | | | | Matt Baker)
| * schemas: Add important attribute for BoundPathSol Jerome2013-11-071-0/+7
| | | | | | | | Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
| * Version bump to 1.3.3v1.3.3Sol Jerome2013-11-0716-19/+31
| | | | | | | | Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
| * bcfg2-selinux: Add pre/rc magicSol Jerome2013-11-071-0/+8
| | | | | | | | Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
| * export: Add missing newlines for solaris manifestsSol Jerome2013-11-061-2/+2
| | | | | | | | Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
| * export: Fix pre/rc behavior for spec filesSol Jerome2013-11-061-15/+32
| | | | | | | | Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
| * export: Fix Release bugSol Jerome2013-11-061-0/+2
| | | | | | | | Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
| * removed unused redhat specfile, export.shChris St. Pierre2013-11-068-552/+1
| |
| * Multiprocessing: removed unused importChris St. Pierre2013-11-061-1/+1
| |
| * bcfg2-crypt: fixed deprecation warningChris St. Pierre2013-11-051-1/+1
| |
| * Multiprocessing: don't reuse child RPC listenersChris St. Pierre2013-11-051-26/+7
| |
| * Merge pull request #110 from AlexanderS/reporting-model-updatesChris St. Pierre2013-11-051-5/+5
| |\ | | | | | | bcfg2-reports: update to use current models
| | * bcfg2-reports: update to use current modelsAlexander Sulfrian2013-06-291-5/+5
| | |
| * | Merge pull request #143 from fennm/proxy-retry-on-ssl-errorChris St. Pierre2013-11-051-1/+0
| |\ \ | | | | | | | | Proxy: Catch SSL errors and retry
| | * | Don't re-raise unknown exceptions per stpierreMichael Fenn2013-11-021-4/+0
| | | |
| | * | Proxy: Catch SSL errors and retryMichael Fenn2013-11-011-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The SSL library can throw an exception during the XMLRPC method call. There is no explicit except statement for this type of exception so they get raised up and abort the client's processing. This patch catches the exception so that normal retry processing occurs. Typical traceback: Traceback (most recent call last): File "/usr/sbin/bcfg2", line 29, in ? sys.exit(main()) File "/usr/sbin/bcfg2", line 26, in main return Client(setup).run() File "/usr/lib/python2.4/site-packages/Bcfg2/Client/Client.py", line 256, in run rawconfig = self.get_config(times=times).decode('utf-8') File "/usr/lib/python2.4/site-packages/Bcfg2/Client/Client.py", line 225, in get_config self.run_probes(times=times) File "/usr/lib/python2.4/site-packages/Bcfg2/Client/Client.py", line 151, in run_probes probes = Bcfg2.Client.XML.XML(str(self.proxy.GetProbes())) File "/usr/lib/python2.4/site-packages/Bcfg2/Proxy.py", line 81, in __call__ return _orig_Method.__call__(self, *args) File "/usr/lib64/python2.4/xmlrpclib.py", line 1096, in __call__ return self.__send(self.__name, args) File "/usr/lib64/python2.4/xmlrpclib.py", line 1383, in __request verbose=self.__verbose File "/usr/lib/python2.4/site-packages/Bcfg2/Proxy.py", line 331, in request return self.parse_response(response) File "/usr/lib64/python2.4/xmlrpclib.py", line 1255, in parse_response return self._parse_response(file, None) File "/usr/lib64/python2.4/xmlrpclib.py", line 1276, in _parse_response response = file.read(1024) File "/usr/lib64/python2.4/httplib.py", line 480, in read s = self.fp.read(amt) File "/usr/lib64/python2.4/socket.py", line 303, in read data = self._sock.recv(recv_size) File "/usr/lib64/python2.4/site-packages/M2Crypto/SSL/Connection.py", line 217, in read return self._read_bio(size) File "/usr/lib64/python2.4/site-packages/M2Crypto/SSL/Connection.py", line 202, in _read_bio return m2.ssl_read(self.ssl, size, self._timeout) M2Crypto.SSL.SSLError: (104, 'Connection reset by peer')
| * | | Merge pull request #144 from fennm/admin-avoid-NotImplementedErrorChris St. Pierre2013-11-052-2/+0
| |\ \ \ | | |/ / | |/| | Admin: Don't call dead Mode.__call__ code
| | * | Admin: Don't call dead Mode.__call__ codeMichael Fenn2013-11-052-2/+0
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | In 9eb3db84, Bcfg2.Server.Admin.Mode.__call__() was changed from pass to raise a NotImplementedError. This causes bcfg2-admin compare and bcfg2-admin snapshots to fail because they call Bcfg2.Server.Admin.Mode.__call__() right away. Since that method didn't do anything anyway, it seems expediant to just avoid the call altogether.
* | | doc: Added docs for TemplateHelper __default__ featureChris St. Pierre2013-11-111-2/+14
| | |
* | | bcfg2-lint: better checks for TemplateHelper __default__ stuffChris St. Pierre2013-11-111-1/+15
| | | | | | | | | | | | | | | | | | | | | * Check to ensure that no symbols use reserved words, which are different for __default__ than for __export__ * Check to ensure that symbols aren't listed in both __default__ and __export__
* | | TemplateHelper: misc. cleanup of __default__ featureChris St. Pierre2013-11-111-14/+20
| | | | | | | | | | | | | | | | | | * Don't require symbols to be listed twice; they can be listed in either __export__ or __default__, but need not be in both. * Check for reserved words in __default__ list
* | | Merge branch 'maint'Sol Jerome2013-11-044-74/+0
|\| | | | | | | | | | | | | | Conflicts: doc/server/admin/index.txt
| * | misc/bcfg2.spec: Remove more unnecessary requiresSol Jerome2013-10-301-2/+0
| | | | | | | | | | | | Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
| * | misc/bcfg2.spec: Remove some unnecessary requiresSol Jerome2013-10-301-4/+0
| | | | | | | | | | | | | | | | | | | | | While a lot of these dependencies can be useful, they aren't necessarily required unless you expect to use particular functionality. Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
| * | doc: Remove deprecated ssl documentationSol Jerome2013-10-303-68/+0
| | | | | | | | | | | | | | | | | | | | | Current RHEL variants and all supported Debian variants have python-ssl support either via the builtin module or a backported python-ssl. Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
| * | doc: Remove reference to bcfg2-admin querySol Jerome2013-10-301-1/+0
| | | | | | | | | | | | | | | | | | The corresponding documentation was removed in ca6abe45. Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
* | | Reporting: fixed error reportingChris St. Pierre2013-10-311-1/+1
| | |
* | | bcfg2-report-collector: import DBSettings explicitly to parse them earlyChris St. Pierre2013-10-311-0/+1
| | |
* | | Options: Don't reparse initial config fileChris St. Pierre2013-10-311-3/+5
| | | | | | | | | | | | It hasn't been parsed at this stage anyway.
* | | Info: Make ^C interaction look nicerSol Jerome2013-10-301-1/+1
| | | | | | | | | | | | Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
* | | bcfg2-reports: rewrote with new option parserChris St. Pierre2013-10-303-278/+280
| | |
* | | Core: Avoid unnecessarily reparsing config file on startupChris St. Pierre2013-10-301-1/+4
| | |
generated by cgit v1.2.3-1-g7c22 (git 2.25.1) at 2024-10-31 13:50:42 +0000