diff options
| author | Narayan Desai <desai@mcs.anl.gov> | 2009-05-06 01:27:33 +0000 |
|---|---|---|
| committer | Narayan Desai <desai@mcs.anl.gov> | 2009-05-06 01:27:33 +0000 |
| commit | d496714c148baaa8f14aa752f2ec25f747b3d0f9 (patch) | |
| tree | b10d8424031b9c9d722d584b95c17c7ec3c5f5a4 | |
| parent | 902c5933e10843d67548bcd80b759abf4926275e (diff) | |
| download | bcfg2-d496714c148baaa8f14aa752f2ec25f747b3d0f9.tar.gz bcfg2-d496714c148baaa8f14aa752f2ec25f747b3d0f9.tar.bz2 bcfg2-d496714c148baaa8f14aa752f2ec25f747b3d0f9.zip | |
SSL: Setup server options
git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@5194 ce84e21b-d406-0410-9b95-82705330c041
| -rw-r--r-- | src/lib/Options.py | 2 | ||||
| -rwxr-xr-x | src/sbin/bcfg2-server | 7 |
2 files changed, 6 insertions, 3 deletions
diff --git a/src/lib/Options.py b/src/lib/Options.py index a3bf90604..f9134c925 100644 --- a/src/lib/Options.py +++ b/src/lib/Options.py @@ -206,6 +206,8 @@ SERVER_KEY = Option('Path to SSL key', cf=('communication', 'key'), default=False, cmd='-K', odesc='<ssl key file>') SERVER_CERT = Option('Path to SSL certificate', default='/etc/bcfg2.key', cf=('communication', 'certificate'), odesc='<ssl cert>') +SERVER_CA = Option('Path to SSL CA Cert', default=False, + cf=('communication', 'ca'), odesc='<ca cert>') SERVER_PASSWORD = Option('Communication Password', cmd='-x', odesc='<password>', cf=('communication', 'password'), default=False) INSTALL_PREFIX = Option('Installation location', cf=('server', 'prefix'), diff --git a/src/sbin/bcfg2-server b/src/sbin/bcfg2-server index 1b923a462..efa484e63 100755 --- a/src/sbin/bcfg2-server +++ b/src/sbin/bcfg2-server @@ -34,6 +34,7 @@ if __name__ == '__main__': }) OPTINFO.update({'key' : Bcfg2.Options.SERVER_KEY, 'cert' : Bcfg2.Options.SERVER_CERT, + 'ca' : Bcfg2.Options.SERVER_CA, 'location' : Bcfg2.Options.SERVER_LOCATION, 'passwd' : Bcfg2.Options.SERVER_PASSWORD, 'static' : Bcfg2.Options.SERVER_STATIC, @@ -51,9 +52,9 @@ if __name__ == '__main__': daemon = setup['daemon'], pidfile_name = setup['daemon'], register=False, cls_kwargs={'setup':setup}, - keyfile='/home/desai/tmp/cert2/b2-s/priv.key', - certfile='/home/desai/tmp/cert2/b2-s/cert.pem', - ca='/home/desai/tmp/cert2/ca-cert.pem', + keyfile=setup['key'], + certfile=setup['cert'], + ca=setup['ca'], ) except KeyboardInterrupt: sys.exit(1) |