diff options
| author | Your name <fabian@bernewireless.net> | 2011-01-03 10:00:00 +0100 |
|---|---|---|
| committer | Sol Jerome <sol.jerome@gmail.com> | 2011-01-05 20:43:02 -0600 |
| commit | dc29201c675a13157397d33da423eb5f7ec9bdd8 (patch) | |
| tree | 7e307ce269d74def8769f0a83afcbf96cb1f7c9a /src/lib/Server/Admin | |
| parent | 00c320f0de5d45a4fb6adcf29405760b8826642a (diff) | |
| download | bcfg2-dc29201c675a13157397d33da423eb5f7ec9bdd8.tar.gz bcfg2-dc29201c675a13157397d33da423eb5f7ec9bdd8.tar.bz2 bcfg2-dc29201c675a13157397d33da423eb5f7ec9bdd8.zip | |
Initial mistakes fixed
(cherry picked from commit 892e6251a65f772d2abfaecae17c4e950c6f6ac7)
Diffstat (limited to 'src/lib/Server/Admin')
| -rw-r--r-- | src/lib/Server/Admin/Init.py | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/lib/Server/Admin/Init.py b/src/lib/Server/Admin/Init.py index fa4b2ae25..9ed62b53f 100644 --- a/src/lib/Server/Admin/Init.py +++ b/src/lib/Server/Admin/Init.py @@ -267,22 +267,22 @@ class Init(Bcfg2.Server.Admin.Mode): def _prompt_key(self): """Ask for the key details (country, state, and location).""" - newcountry = raw_input("Country code for key: " + newcountry = raw_input("Country code for key: ") if newcountry != '': self.country = newcountry - else + else: self.country = 'US' - newstate = raw_input("State for key: " + newstate = raw_input("State for key: ") if newstate != '': self.state = newstate - else + else: self.state = 'Illinois' - newlocation = raw_input("Location for key: " + newlocation = raw_input("Location for key: ") if newlocation != '': self.location = newlocation - else + else: self.location = 'Argonne' def _init_plugins(self): @@ -318,7 +318,7 @@ class Init(Bcfg2.Server.Admin.Mode): create_conf(self.configfile, confdata) kpath = keypath + '/bcfg2.key' cpath = keypath + '/bcfg2.crt' - create_key(self.shostname, kpath, cpath) + create_key(self.shostname, kpath, cpath, self.country, self.state, self.location) # Create the repository path = "%s/%s" % (self.repopath, 'etc') |