diff options
| author | Sol Jerome <sol.jerome@gmail.com> | 2013-07-27 17:19:47 -0500 |
|---|---|---|
| committer | Sol Jerome <sol.jerome@gmail.com> | 2013-07-27 17:19:47 -0500 |
| commit | aa230853296cd3b69f0296d646daf37b4b2cd764 (patch) | |
| tree | 8ad1a2e8ee5f05ef775c2536984440a0cc74ec78 /src/lib/Bcfg2/Options.py | |
| parent | 08f5ad7e1b470b79ce81130b2f299426b132db80 (diff) | |
| parent | 3435963a7c715bd3e6e912c6224fc8b893b1abe4 (diff) | |
| download | bcfg2-aa230853296cd3b69f0296d646daf37b4b2cd764.tar.gz bcfg2-aa230853296cd3b69f0296d646daf37b4b2cd764.tar.bz2 bcfg2-aa230853296cd3b69f0296d646daf37b4b2cd764.zip | |
Merge branch 'maint'
Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
Conflicts:
doc/appendix/guides/ubuntu.txt
src/lib/Bcfg2/Options.py
src/lib/Bcfg2/Server/Plugins/Packages/Yum.py
src/lib/Bcfg2/settings.py
Diffstat (limited to 'src/lib/Bcfg2/Options.py')
| -rw-r--r-- | src/lib/Bcfg2/Options.py | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/src/lib/Bcfg2/Options.py b/src/lib/Bcfg2/Options.py index a1fd07b86..41bf54dfb 100644 --- a/src/lib/Bcfg2/Options.py +++ b/src/lib/Bcfg2/Options.py @@ -666,13 +666,17 @@ DB_HOST = \ DB_PORT = \ Option('Database port', default='', - cf=('database', 'port')) - + cf=('database', 'port'), + deprecated_cf=('statistics', 'database_port')) DB_OPTIONS = \ Option('Database options', default=dict(), cf=('database', 'options'), cook=dict_split) +DB_SCHEMA = \ + Option('Database schema', + default='', + cf=('database', 'schema')) # Django options WEB_CFILE = \ @@ -1154,7 +1158,8 @@ SERVER_COMMON_OPTIONS = dict(repo=SERVER_REPOSITORY, authentication=SERVER_AUTHENTICATION, perflog=LOG_PERFORMANCE, perflog_interval=PERFLOG_INTERVAL, - children=SERVER_CHILDREN) + children=SERVER_CHILDREN, + client_timeout=CLIENT_TIMEOUT) CRYPT_OPTIONS = dict(encrypt=ENCRYPT, decrypt=DECRYPT, @@ -1246,6 +1251,7 @@ DATABASE_COMMON_OPTIONS = dict(web_configfile=WEB_CFILE, db_host=DB_HOST, db_port=DB_PORT, db_options=DB_OPTIONS, + db_schema=DB_SCHEMA, time_zone=DJANGO_TIME_ZONE, django_debug=DJANGO_DEBUG, web_prefix=DJANGO_WEB_PREFIX) |