diff options
| author | Fabian Affolter <fabian@bernewireless.net> | 2011-01-03 11:00:11 +0100 |
|---|---|---|
| committer | Sol Jerome <sol.jerome@gmail.com> | 2011-01-05 20:43:21 -0600 |
| commit | 16bac4538fd1362dd23eb2f2b998033079e22837 (patch) | |
| tree | 54449836d457d01379a1061b6b238510408404b0 | |
| parent | dc29201c675a13157397d33da423eb5f7ec9bdd8 (diff) | |
| download | bcfg2-16bac4538fd1362dd23eb2f2b998033079e22837.tar.gz bcfg2-16bac4538fd1362dd23eb2f2b998033079e22837.tar.bz2 bcfg2-16bac4538fd1362dd23eb2f2b998033079e22837.zip | |
Description changed to match the standard openssl names
(cherry picked from commit 6047e808b2f0e09560442a05da870475bcd2b7ec)
Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
| -rw-r--r-- | src/lib/Server/Admin/Init.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/Server/Admin/Init.py b/src/lib/Server/Admin/Init.py index 9ed62b53f..c2dcd2184 100644 --- a/src/lib/Server/Admin/Init.py +++ b/src/lib/Server/Admin/Init.py @@ -188,7 +188,7 @@ class Init(Bcfg2.Server.Admin.Mode): self._prompt_hostname() self._prompt_server() self._prompt_groups() - self._prompt_key() + self._prompt_certificate() # Initialize the repository self.init_repo() @@ -265,21 +265,21 @@ class Init(Bcfg2.Server.Admin.Mode): if plugins_are_valid: break - def _prompt_key(self): + def _prompt_certificate(self): """Ask for the key details (country, state, and location).""" - newcountry = raw_input("Country code for key: ") + newcountry = raw_input("Country name (2 letter code) for certificate: ") if newcountry != '': self.country = newcountry else: self.country = 'US' - newstate = raw_input("State for key: ") + newstate = raw_input("State or Province Name (full name) for certificate: ") if newstate != '': self.state = newstate else: self.state = 'Illinois' - newlocation = raw_input("Location for key: ") + newlocation = raw_input("Locality Name (eg, city) for certificate: ") if newlocation != '': self.location = newlocation else: |