summaryrefslogtreecommitdiffstats
path: root/src/lib/Bcfg2/Options
diff options
context:
space:
mode:
authorAlexander Sulfrian <alexander@sulfrian.net>2014-10-14 12:38:26 +0200
committerAlexander Sulfrian <alexander@sulfrian.net>2014-10-14 17:22:41 +0200
commit44a6f8bdbc3fe6ed69ed9c0ca0fe5c05b9794ea8 (patch)
treeeab81b2417a4118f4870ab3e3ef173ff6d208df4 /src/lib/Bcfg2/Options
parent17e5051d616caca3974ba8662b7cc9441621c2e9 (diff)
downloadbcfg2-44a6f8bdbc3fe6ed69ed9c0ca0fe5c05b9794ea8.tar.gz
bcfg2-44a6f8bdbc3fe6ed69ed9c0ca0fe5c05b9794ea8.tar.bz2
bcfg2-44a6f8bdbc3fe6ed69ed9c0ca0fe5c05b9794ea8.zip
Options/Common: remove defaults for ssl-key/ssl-cert on the Client
With these default values it is impossible to remove the ssl key and ssl cert from the configuration and use password auth. Configuration options could not be condensed in Bcfg2.Options.Common, because Server and Client needs different default values.
Diffstat (limited to 'src/lib/Bcfg2/Options')
-rw-r--r--src/lib/Bcfg2/Options/Common.py10
1 files changed, 0 insertions, 10 deletions
diff --git a/src/lib/Bcfg2/Options/Common.py b/src/lib/Bcfg2/Options/Common.py
index 8f5cf8f06..06e2d2914 100644
--- a/src/lib/Bcfg2/Options/Common.py
+++ b/src/lib/Bcfg2/Options/Common.py
@@ -107,16 +107,6 @@ class Common(object):
'-x', '--password', cf=('communication', 'password'),
metavar='<password>', help="Communication Password")
- #: Path to SSL key
- ssl_key = PathOption(
- '--ssl-key', cf=('communication', 'key'), dest="key",
- help='Path to SSL key', default="/etc/pki/tls/private/bcfg2.key")
-
- #: Path to SSL certificate
- ssl_cert = PathOption(
- cf=('communication', 'certificate'), dest="cert",
- help='Path to SSL certificate', default="/etc/pki/tls/certs/bcfg2.crt")
-
#: Path to SSL CA certificate
ssl_ca = PathOption(
cf=('communication', 'ca'), help='Path to SSL CA Cert')