From 16bac4538fd1362dd23eb2f2b998033079e22837 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 3 Jan 2011 11:00:11 +0100 Subject: Description changed to match the standard openssl names (cherry picked from commit 6047e808b2f0e09560442a05da870475bcd2b7ec) Signed-off-by: Sol Jerome --- src/lib/Server/Admin/Init.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/lib/Server/Admin/Init.py') 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: -- cgit v1.2.3-1-g7c22