diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/Bcfg2/Options.py | 10 | ||||
| -rwxr-xr-x | src/sbin/bcfg2-info | 1 |
2 files changed, 0 insertions, 11 deletions
diff --git a/src/lib/Bcfg2/Options.py b/src/lib/Bcfg2/Options.py index a5436dbd0..f1bc54d49 100644 --- a/src/lib/Bcfg2/Options.py +++ b/src/lib/Bcfg2/Options.py @@ -467,11 +467,6 @@ SERVER_PLUGINS = \ 'SSHbase'], cf=('server', 'plugins'), cook=list_split) -SERVER_MCONNECT = \ - Option('Server Metadata Connector list', - default=['Probes'], - cf=('server', 'connectors'), - cook=list_split) SERVER_FILEMONITOR = \ Option('Server file monitor', default='default', @@ -496,10 +491,6 @@ SERVER_LOCATION = \ cmd='-S', odesc='https://server:port', cf=('components', 'bcfg2')) -SERVER_STATIC = \ - Option('Server runs on static port', - default=False, - cf=('components', 'bcfg2')) SERVER_KEY = \ Option('Path to SSL key', default=None, @@ -996,7 +987,6 @@ SERVER_COMMON_OPTIONS = dict(repo=SERVER_REPOSITORY, filemonitor=SERVER_FILEMONITOR, ignore=SERVER_FAM_IGNORE, location=SERVER_LOCATION, - static=SERVER_STATIC, key=SERVER_KEY, cert=SERVER_CERT, ca=SERVER_CA, diff --git a/src/sbin/bcfg2-info b/src/sbin/bcfg2-info index 44379ee89..f67850587 100755 --- a/src/sbin/bcfg2-info +++ b/src/sbin/bcfg2-info @@ -497,7 +497,6 @@ class infoCore(cmd.Cmd, Bcfg2.Server.Core.BaseCore): ('Server Metadata Connector', setup['mconnect']), ('Filemonitor', setup['filemonitor']), ('Server address', setup['location']), - ('Static', setup['static']), ('Path to key', setup['key']), ('Path to SSL certificate', setup['cert']), ('Path to SSL CA certificate', setup['ca']), |