diff options
author | Alexander Sulfrian <alexander@sulfrian.net> | 2014-10-15 16:25:12 +0200 |
---|---|---|
committer | Alexander Sulfrian <alexander@sulfrian.net> | 2014-10-15 17:05:26 +0200 |
commit | 1aeff29bfb5fb35c075c310e0af235ccf286fc48 (patch) | |
tree | e2d1edd5bae370a2a5a91abff8bfa2c2250e38f8 /src/lib/Bcfg2/Server | |
parent | 45e07c7714116b7b88c40a55728be0c0b3c8a0fb (diff) | |
download | bcfg2-1aeff29bfb5fb35c075c310e0af235ccf286fc48.tar.gz bcfg2-1aeff29bfb5fb35c075c310e0af235ccf286fc48.tar.bz2 bcfg2-1aeff29bfb5fb35c075c310e0af235ccf286fc48.zip |
Options: add missing communication:protocol options
The option was there in bcfg2-1.3.x and is still documented (maybe it just
got lost during the options rewrite).
Diffstat (limited to 'src/lib/Bcfg2/Server')
-rw-r--r-- | src/lib/Bcfg2/Server/BuiltinCore.py | 3 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/Core.py | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/lib/Bcfg2/Server/BuiltinCore.py b/src/lib/Bcfg2/Server/BuiltinCore.py index 0023e9313..769addf55 100644 --- a/src/lib/Bcfg2/Server/BuiltinCore.py +++ b/src/lib/Bcfg2/Server/BuiltinCore.py @@ -113,7 +113,8 @@ class BuiltinCore(NetworkCore): keyfile=Bcfg2.Options.setup.key, certfile=Bcfg2.Options.setup.cert, register=False, - ca=Bcfg2.Options.setup.ca) + ca=Bcfg2.Options.setup.ca, + protocol=Bcfg2.Options.setup.protocol) except: # pylint: disable=W0702 err = sys.exc_info()[1] self.logger.error("Server startup failed: %s" % err) diff --git a/src/lib/Bcfg2/Server/Core.py b/src/lib/Bcfg2/Server/Core.py index 8cb6eb11b..892f2832a 100644 --- a/src/lib/Bcfg2/Server/Core.py +++ b/src/lib/Bcfg2/Server/Core.py @@ -1371,6 +1371,7 @@ class NetworkCore(Core): options = Core.options + [ Bcfg2.Options.Common.daemon, Bcfg2.Options.Common.syslog, Bcfg2.Options.Common.location, Bcfg2.Options.Common.ssl_ca, + Bcfg2.Options.Common.protocol, Bcfg2.Options.PathOption( '--ssl-key', cf=('communication', 'key'), dest="key", help='Path to SSL key', |