summaryrefslogtreecommitdiffstats
path: root/src/lib/Bcfg2/Options.py
diff options
context:
space:
mode:
authorTim Laszlo <tim.laszlo@gmail.com>2012-08-07 13:37:33 -0500
committerTim Laszlo <tim.laszlo@gmail.com>2012-08-07 13:37:33 -0500
commit5b3ffd488a8b5f727a531a3b7c3ca419bb53d04e (patch)
treee816129405d12aad7069b7450b9121ed201ea23b /src/lib/Bcfg2/Options.py
parentcb928a1f548fe1e65933ecbb62220295802f160b (diff)
downloadbcfg2-5b3ffd488a8b5f727a531a3b7c3ca419bb53d04e.tar.gz
bcfg2-5b3ffd488a8b5f727a531a3b7c3ca419bb53d04e.tar.bz2
bcfg2-5b3ffd488a8b5f727a531a3b7c3ca419bb53d04e.zip
Merge reporting configuration with main server configuration
Admin/Syncdb: Use SchemaUpdater Move the schema update routines from reports to Bcfg2.Server Move Reports.settings into Bcfg2.settings
Diffstat (limited to 'src/lib/Bcfg2/Options.py')
-rw-r--r--src/lib/Bcfg2/Options.py16
1 files changed, 16 insertions, 0 deletions
diff --git a/src/lib/Bcfg2/Options.py b/src/lib/Bcfg2/Options.py
index fb36a985b..37781e2ed 100644
--- a/src/lib/Bcfg2/Options.py
+++ b/src/lib/Bcfg2/Options.py
@@ -451,6 +451,22 @@ DB_PORT = \
default='',
cf=('database', 'port'),)
+# Django options
+DJANGO_TIME_ZONE = \
+ Option('Django timezone',
+ default=None,
+ cf=('statistics', 'time_zone'),)
+DJANGO_DEBUG = \
+ Option('Django debug',
+ default=None,
+ cf=('statistics', 'debug'),)
+# Django options
+DJANGO_WEB_PREFIX = \
+ Option('Web prefix',
+ default=None,
+ cf=('statistics', 'web_prefix'),)
+
+
# Client options
CLIENT_KEY = \
Option('Path to SSL key',