summaryrefslogtreecommitdiffstats
path: root/src/lib/Server/Admin
diff options
context:
space:
mode:
authorRaul Cuza <raulcuza@gmail.com>2011-05-06 23:48:49 -0400
committerRaul Cuza <raulcuza@gmail.com>2011-05-06 23:48:49 -0400
commit372347c63082fbb2e0c09f0b4e42f307a45c1fe6 (patch)
treefc7d61a6a4b1cca8d6e8f8e6913f461341b9bcb2 /src/lib/Server/Admin
parent5db084d815c9ddb7e12219e501d38ed11b9db632 (diff)
downloadbcfg2-372347c63082fbb2e0c09f0b4e42f307a45c1fe6.tar.gz
bcfg2-372347c63082fbb2e0c09f0b4e42f307a45c1fe6.tar.bz2
bcfg2-372347c63082fbb2e0c09f0b4e42f307a45c1fe6.zip
Pass keypath to create_conf function.
Diffstat (limited to 'src/lib/Server/Admin')
-rw-r--r--src/lib/Server/Admin/Init.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/Server/Admin/Init.py b/src/lib/Server/Admin/Init.py
index f450e5303..fff8bcd1c 100644
--- a/src/lib/Server/Admin/Init.py
+++ b/src/lib/Server/Admin/Init.py
@@ -142,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
@@ -402,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,