summaryrefslogtreecommitdiffstats
path: root/src/lib/Bcfg2/Options.py
diff options
context:
space:
mode:
authorChris St. Pierre <chris.a.st.pierre@gmail.com>2013-02-07 10:01:16 -0500
committerChris St. Pierre <chris.a.st.pierre@gmail.com>2013-02-14 14:56:33 -0500
commitb8ebd636ac3a5e2919b3e62041019f26acb1e2c0 (patch)
treebf0f06592d0c5d635828ad4536ff86421c1a5a90 /src/lib/Bcfg2/Options.py
parentff0048a3a26c9076c8052a8c7be171e4364f0d09 (diff)
downloadbcfg2-b8ebd636ac3a5e2919b3e62041019f26acb1e2c0.tar.gz
bcfg2-b8ebd636ac3a5e2919b3e62041019f26acb1e2c0.tar.bz2
bcfg2-b8ebd636ac3a5e2919b3e62041019f26acb1e2c0.zip
Metadata: allowed setting global default authentication type
Diffstat (limited to 'src/lib/Bcfg2/Options.py')
-rw-r--r--src/lib/Bcfg2/Options.py8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/lib/Bcfg2/Options.py b/src/lib/Bcfg2/Options.py
index 07d089f05..be3a4c7b3 100644
--- a/src/lib/Bcfg2/Options.py
+++ b/src/lib/Bcfg2/Options.py
@@ -582,6 +582,11 @@ SERVER_UMASK = \
default='0077',
odesc='<Server umask>',
cf=('server', 'umask'))
+SERVER_AUTHENTICATION = \
+ Option('Default client authentication method',
+ default='cert+password',
+ odesc='{cert|bootstrap|cert+password}',
+ cf=('communication', 'authentication'))
# database options
DB_ENGINE = \
@@ -1115,7 +1120,8 @@ SERVER_COMMON_OPTIONS = dict(repo=SERVER_REPOSITORY,
protocol=SERVER_PROTOCOL,
web_configfile=WEB_CFILE,
backend=SERVER_BACKEND,
- vcs_root=SERVER_VCS_ROOT)
+ vcs_root=SERVER_VCS_ROOT,
+ authentication=SERVER_AUTHENTICATION)
CRYPT_OPTIONS = dict(encrypt=ENCRYPT,
decrypt=DECRYPT,