diff options
| author | Raul Cuza <raulcuza@gmail.com> | 2011-05-06 23:48:49 -0400 |
|---|---|---|
| committer | Sol Jerome <sol.jerome@gmail.com> | 2011-06-14 12:36:44 -0500 |
| commit | 4838c1477108fd61b2f65f79f8e3d31776cd1ba6 (patch) | |
| tree | e8b036a65a4e76873dc33dc26971b468491eb279 /src | |
| parent | 417f502abe96ab7d784cbc872aeb65add9a509ba (diff) | |
| download | bcfg2-4838c1477108fd61b2f65f79f8e3d31776cd1ba6.tar.gz bcfg2-4838c1477108fd61b2f65f79f8e3d31776cd1ba6.tar.bz2 bcfg2-4838c1477108fd61b2f65f79f8e3d31776cd1ba6.zip | |
Pass keypath to create_conf function.
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/Server/Admin/Init.py | 4 |
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, |