summaryrefslogtreecommitdiffstats
path: root/src/lib/Bcfg2/settings.py
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'maint'Chris St. Pierre2013-06-271-0/+2
|\ | | | | | | | | | | | | | | | | Conflicts: doc/server/plugins/generators/cfg.txt doc/server/plugins/generators/tcheetah.txt src/lib/Bcfg2/Server/Admin/Xcmd.py src/lib/Bcfg2/Server/Plugins/Cfg/__init__.py src/lib/Bcfg2/Server/Plugins/Packages/Yum.py
| * Remove extra importSol Jerome2013-05-011-1/+0
| | | | | | | | Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
| * Reports: Add support for Django 1.5Sol Jerome2013-04-291-0/+3
| | | | | | | | Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
* | Merge branch 'maint'Chris St. Pierre2013-04-241-2/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/lib/Bcfg2/Client/Client.py src/lib/Bcfg2/Client/Frame.py src/lib/Bcfg2/Client/Tools/YUM.py src/lib/Bcfg2/Options.py src/lib/Bcfg2/Server/Admin/Perf.py src/lib/Bcfg2/Server/Admin/Xcmd.py src/lib/Bcfg2/Server/Admin/__init__.py src/lib/Bcfg2/Server/Core.py src/lib/Bcfg2/Server/FileMonitor/Fam.py src/lib/Bcfg2/Server/Lint/RequiredAttrs.py src/lib/Bcfg2/Server/Plugin/helpers.py src/lib/Bcfg2/Server/Plugins/Base.py src/lib/Bcfg2/Server/Plugins/Bundler.py src/lib/Bcfg2/Server/Plugins/Cfg/CfgPrivateKeyCreator.py src/lib/Bcfg2/Server/Plugins/Cvs.py src/lib/Bcfg2/Server/Plugins/Darcs.py src/lib/Bcfg2/Server/Plugins/Decisions.py src/lib/Bcfg2/Server/Plugins/FileProbes.py src/lib/Bcfg2/Server/Plugins/Fossil.py src/lib/Bcfg2/Server/Plugins/Git.py src/lib/Bcfg2/Server/Plugins/Metadata.py src/lib/Bcfg2/Server/Plugins/NagiosGen.py src/lib/Bcfg2/Server/Plugins/Packages/PackagesSources.py src/lib/Bcfg2/Server/Plugins/Packages/Source.py src/lib/Bcfg2/Server/Plugins/Packages/Yum.py src/lib/Bcfg2/Server/Plugins/Properties.py src/lib/Bcfg2/Server/Plugins/__init__.py src/lib/Bcfg2/Server/__init__.py src/sbin/bcfg2-build-reports src/sbin/bcfg2-crypt testsuite/Testsrc/Testlib/TestServer/TestPlugin/Testhelpers.py testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestMetadata.py testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestProperties.py
| * pylint fix for Bcfg2.settingsChris St. Pierre2013-04-171-2/+2
| |
* | Merge branch '1.4.x'Chris St. Pierre2013-04-231-14/+14
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: debian/bcfg2-server.install doc/server/plugins/grouping/metadata.txt src/lib/Bcfg2/Client/Client.py src/lib/Bcfg2/Client/Tools/Portage.py src/lib/Bcfg2/Client/Tools/RcUpdate.py src/lib/Bcfg2/Client/Tools/YUM24.py src/lib/Bcfg2/Client/Tools/__init__.py src/lib/Bcfg2/Client/Tools/launchd.py src/lib/Bcfg2/Options.py src/lib/Bcfg2/Server/Core.py src/lib/Bcfg2/Server/Plugin/helpers.py src/lib/Bcfg2/Server/Plugins/Metadata.py src/lib/Bcfg2/Server/models.py src/lib/Bcfg2/Utils.py src/sbin/bcfg2-info src/sbin/bcfg2-test testsuite/Testsrc/Testlib/TestClient/TestTools/Test_init.py testsuite/Testsrc/test_code_checks.py
| * \ Merge branch 'master' into 1.4.xChris St. Pierre2013-02-201-0/+2
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/appendix/contributors.txt schemas/bundle.xsd src/lib/Bcfg2/Client/Tools/__init__.py src/lib/Bcfg2/Server/Encryption.py src/lib/Bcfg2/Server/Lint/Genshi.py src/lib/Bcfg2/Server/Plugins/Bundler.py src/lib/Bcfg2/Server/Plugins/Decisions.py src/lib/Bcfg2/Server/Plugins/TemplateHelper.py src/sbin/bcfg2-test testsuite/Testsrc/Testlib/TestClient/TestTools/TestPOSIX/Test__init.py testsuite/Testsrc/Testlib/TestClient/TestTools/TestPOSIXUsers.py testsuite/Testsrc/Testlib/TestServer/TestPlugin/Testhelpers.py testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestProperties.py tools/bcfg2-profile-templates.py
| * | | added module-level OptionParser to avoid passing it as an argument or global ↵Chris St. Pierre2013-01-171-14/+14
| | | | | | | | | | | | | | | | all over
* | | | Merge branch 'maint'Chris St. Pierre2013-03-251-3/+3
|\ \ \ \ | | |_|/ | |/| |
| * | | Added trailing / on MEDIA_URL to get rid of deprecated warningsJon Norman2013-03-231-1/+1
| | | |
| * | | Reports: Fix deprecated Django settings (reported by jonten)Sol Jerome2013-03-221-2/+2
| | | | | | | | | | | | | | | | Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
| * | | Revert last changeTim Laszlo2013-03-181-4/+1
| | | |
| * | | Fix django TIME_ZONE for django < 1.2Tim Laszlo2013-03-181-1/+4
| | |/ | |/| | | | | | | (cherry picked from commit e0d8251f2b8cb315b8124d2733aaab90b9f7e2a2)
* | | Remove checks for unsupported django versions < 1.2Tim Laszlo2013-03-181-35/+11
| | |
* | | Revert last changeTim Laszlo2013-03-181-4/+1
| | | | | | | | | | | | (cherry picked from commit d9780453ff411a45804cdb3fc25964c3f046a4a0)
* | | Fix django TIME_ZONE for django < 1.2Tim Laszlo2013-03-181-1/+4
|/ /
* / add old schema to migrationTim Laszlo2013-01-291-0/+2
|/
* fix pylint unit test errorsChris St. Pierre2012-10-091-14/+14
|
* Remove hardcoded DEBUG = TrueTim Laszlo2012-10-081-1/+0
|
* Reporting: Merge new reporting dataTim Laszlo2012-10-081-3/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move reporting data to a new schema Use south for django migrations Add bcfg2-report-collector daemon Conflicts: doc/development/index.txt doc/server/plugins/connectors/properties.txt doc/server/plugins/generators/packages.txt setup.py src/lib/Bcfg2/Client/Tools/SELinux.py src/lib/Bcfg2/Compat.py src/lib/Bcfg2/Encryption.py src/lib/Bcfg2/Options.py src/lib/Bcfg2/Server/Admin/Init.py src/lib/Bcfg2/Server/Admin/Reports.py src/lib/Bcfg2/Server/BuiltinCore.py src/lib/Bcfg2/Server/Core.py src/lib/Bcfg2/Server/FileMonitor/Inotify.py src/lib/Bcfg2/Server/Plugin/base.py src/lib/Bcfg2/Server/Plugin/interfaces.py src/lib/Bcfg2/Server/Plugins/Cfg/CfgEncryptedGenerator.py src/lib/Bcfg2/Server/Plugins/FileProbes.py src/lib/Bcfg2/Server/Plugins/Ohai.py src/lib/Bcfg2/Server/Plugins/Packages/Collection.py src/lib/Bcfg2/Server/Plugins/Packages/Source.py src/lib/Bcfg2/Server/Plugins/Packages/Yum.py src/lib/Bcfg2/Server/Plugins/Packages/__init__.py src/lib/Bcfg2/Server/Plugins/Probes.py src/lib/Bcfg2/Server/Plugins/Properties.py src/lib/Bcfg2/Server/Reports/backends.py src/lib/Bcfg2/Server/Reports/manage.py src/lib/Bcfg2/Server/Reports/nisauth.py src/lib/Bcfg2/settings.py src/sbin/bcfg2-crypt src/sbin/bcfg2-yum-helper testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestProbes.py testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestSEModules.py
* settings: Fix variable usageSol Jerome2012-09-251-1/+1
| | | | Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
* expanded pylint coverageChris St. Pierre2012-09-251-10/+17
|
* Corrected template loader versionTim Laszlo2012-09-211-1/+1
|
* reports: Update TEMPLATE_LOADERS for older versions of DjangoTim Laszlo2012-09-211-4/+10
|
* settings: Fix django webapp for 1.4 (#1121)Sol Jerome2012-09-031-2/+2
| | | | Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
* Bcfg2.settings: Fixed config file reading:Chris St. Pierre2012-08-281-8/+26
| | | | | | | | | | | | | | | | | | | | * If -W is given on the command line, the config file given by -W is read. * If /etc/bcfg2-web.conf does not exist, and -C was given on the command line, the config file given by -C is read. * If /etc/bcfg2-web.conf does not exist and -C was not given on the command line, the default /etc/bcfg2.conf is read. * If /etc/bcfg2-web.conf exists, and neither -W nor -C was given on the command line, then /etc/bcfg2-web.conf is read. This will produce errors if: * A bogus (non-existent, unreadable) file was given by -W; or * A bogus file was given by -C and /etc/bcfg2-web.conf does not exist; or * No -W was given and /etc/bcfg2-web.conf exists but is unreadable; or * No -W was given, /etc/bcfg2-web.conf does not exist, and /etc/bcfg2.conf is bogus.
* fixed Bcfg2.settings if django not availableChris St. Pierre2012-08-201-1/+1
|
* Bcfg2.settings: bcfg2-web.conf is the default, unless bcfg2-web.conf doesn't ↵Chris St. Pierre2012-08-161-18/+12
| | | | exit and bcfg2.conf does
* Django: Prevent DeprecationWarningSol Jerome2012-08-141-1/+1
| | | | | | | DeprecationWarning: Short names for ENGINE in database configurations are deprecated. Prepend default.ENGINE with 'django.db.backends.' Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
* Merge reporting configuration with main server configurationTim Laszlo2012-08-071-10/+101
| | | | | | Admin/Syncdb: Use SchemaUpdater Move the schema update routines from reports to Bcfg2.Server Move Reports.settings into Bcfg2.settings
* unified Metadata/DBMetadata pluginsChris St. Pierre2012-07-311-3/+8
| | | | made django optional
* Metadata and other improvements:Chris St. Pierre2012-07-301-0/+71
* Added support for Client tag in groups.xml * Added support for nested Group tags in groups.xml * Added support for negated groups in groups.xml * Added DatabaseBacked plugin mixin to easily allow plugins to connect to a database specified in global database settings in bcfg2.conf * Added DBMetadata plugin that uses relational DB to store client records instead of writing to clients.xml
generated by cgit v1.2.3-1-g7c22 (git 2.25.1) at 2024-10-31 14:21:01 +0000