diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-08-16 10:01:43 -0400 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-08-16 10:01:43 -0400 |
| commit | fbbd936841af6a4ae9ebdc52d4e87da60368353e (patch) | |
| tree | d625e674b1cd81434e7f5a973421a91eb91ecb03 /src/lib/Bcfg2/Options.py | |
| parent | 6de50a235ed21de987488a2890b13f029d1962b4 (diff) | |
| download | bcfg2-fbbd936841af6a4ae9ebdc52d4e87da60368353e.tar.gz bcfg2-fbbd936841af6a4ae9ebdc52d4e87da60368353e.tar.bz2 bcfg2-fbbd936841af6a4ae9ebdc52d4e87da60368353e.zip | |
Bcfg2.settings: bcfg2-web.conf is the default, unless bcfg2-web.conf doesn't exit and bcfg2.conf does
Diffstat (limited to 'src/lib/Bcfg2/Options.py')
| -rw-r--r-- | src/lib/Bcfg2/Options.py | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/src/lib/Bcfg2/Options.py b/src/lib/Bcfg2/Options.py index edebd10b3..3af5885bb 100644 --- a/src/lib/Bcfg2/Options.py +++ b/src/lib/Bcfg2/Options.py @@ -477,6 +477,11 @@ DB_PORT = \ deprecated_cf=('statistics', 'database_port')) # Django options +WEB_CFILE = \ + Option('Web interface configuration file', + default="/etc/bcfg2-web.conf", + cmd='-W', + cf=('statistics', 'config'),) DJANGO_TIME_ZONE = \ Option('Django timezone', default=None, @@ -894,6 +899,7 @@ SERVER_COMMON_OPTIONS = dict(repo=SERVER_REPOSITORY, cert=SERVER_CERT, ca=SERVER_CA, protocol=SERVER_PROTOCOL, + web_configfile=WEB_CFILE, backend=SERVER_BACKEND) CRYPT_OPTIONS = dict(encrypt=ENCRYPT, @@ -969,6 +975,17 @@ CLIENT_COMMON_OPTIONS = \ CLIENT_COMMON_OPTIONS.update(DRIVER_OPTIONS) CLIENT_COMMON_OPTIONS.update(CLI_COMMON_OPTIONS) +DATABASE_COMMON_OPTIONS = dict(web_configfile=WEB_CFILE, + db_engine=DB_ENGINE, + db_name=DB_NAME, + db_user=DB_USER, + db_password=DB_PASSWORD, + db_host=DB_HOST, + db_port=DB_PORT, + time_zone=DJANGO_TIME_ZONE, + django_debug=DJANGO_DEBUG, + web_prefix=DJANGO_WEB_PREFIX) + class OptionParser(OptionSet): """ |