diff options
author | Sol Jerome <solj+dev@soljerome.com> | 2011-05-07 13:52:02 -0700 |
---|---|---|
committer | Sol Jerome <solj+dev@soljerome.com> | 2011-05-07 13:52:02 -0700 |
commit | 2f5f9812f946918fbc1e1d665d6daaedaa31a7ca (patch) | |
tree | ef2ba7347631292b1802485a02794e688b59f802 /src/lib/Server | |
parent | ab4ab921d96ef9ed1f3246d57ad888b46b17b668 (diff) | |
parent | 2c4111694b6c2eb94ddeb945174b58e1595e2c84 (diff) | |
download | bcfg2-2f5f9812f946918fbc1e1d665d6daaedaa31a7ca.tar.gz bcfg2-2f5f9812f946918fbc1e1d665d6daaedaa31a7ca.tar.bz2 bcfg2-2f5f9812f946918fbc1e1d665d6daaedaa31a7ca.zip |
Merge pull request #28 from rcuza/master
Ticket 1008 Resolution Patches plus a Preflight Cleanup Modification
Diffstat (limited to 'src/lib/Server')
-rw-r--r-- | src/lib/Server/Admin/Init.py | 5 | ||||
-rw-r--r-- | src/lib/Server/Plugins/SSHbase.py | 1 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/lib/Server/Admin/Init.py b/src/lib/Server/Admin/Init.py index e69412a5e..fff8bcd1c 100644 --- a/src/lib/Server/Admin/Init.py +++ b/src/lib/Server/Admin/Init.py @@ -4,6 +4,7 @@ import random import socket import stat import string +import sys import subprocess import Bcfg2.Server.Admin import Bcfg2.Server.Plugin @@ -141,7 +142,7 @@ def create_key(hostname, keypath, certpath, country, state, location): os.chmod(keypath, stat.S_IRUSR | stat.S_IWUSR) # 0600 -def create_conf(confpath, confdata): +def create_conf(confpath, confdata, keypath): # Don't overwrite existing bcfg2.conf file if os.path.exists(confpath): # py3k compatibility @@ -401,7 +402,7 @@ class Init(Bcfg2.Server.Admin.Mode): self.server_uri) # Create the configuration file and SSL key - create_conf(self.configfile, confdata) + create_conf(self.configfile, confdata, keypath) kpath = keypath + '/bcfg2.key' cpath = keypath + '/bcfg2.crt' create_key(self.shostname, kpath, cpath, self.country, diff --git a/src/lib/Server/Plugins/SSHbase.py b/src/lib/Server/Plugins/SSHbase.py index ce08235eb..97238f4f3 100644 --- a/src/lib/Server/Plugins/SSHbase.py +++ b/src/lib/Server/Plugins/SSHbase.py @@ -5,6 +5,7 @@ import binascii import os import socket import shutil +import sys import tempfile from subprocess import Popen, PIPE import Bcfg2.Server.Plugin |