Merged pki-silent into pki-server.

The pki-silent package has been merged into pki-server package.

Ticket #354

2 files changed, 10 insertions, 12 deletions

diff --git a/base/silent/templates/pki_silent.template b/base/silent/templates/pki_silent.template
index 93ff5849a..27e4ae77f 100755
--- a/base/silent/templates/pki_silent.template
+++ b/base/silent/templates/pki_silent.template
@@ -19,15 +19,14 @@ if	[ "${pki_silent_script}" = "pki_silent.template" ] ; then
 	printf "Usage:  (1) Install AND configure a directory server instance.\n\n"
 	printf "        (2) Install, but do NOT configure ALL six\n"
 	printf "            'default' PKI subsystem instances.\n\n"
-	printf "        (3) Install the 'pki-silent' package.\n\n"
-	printf "        (4) Copy '$0' to a new script name\n"
+	printf "        (3) Copy '$0' to a new script name\n"
 	printf "            without the '.template' extension.\n"
 	printf "            (e .g. - 'configure_default_pki_instances')\n\n"
-	printf "        (5) Fill in all MANDATORY user-defined variables\n"
+	printf "        (4) Fill in all MANDATORY user-defined variables\n"
 	printf "            in the new script.\n\n"
-	printf "        (6) Change any OPTIONAL user-defined variables\n"
+	printf "        (5) Change any OPTIONAL user-defined variables\n"
 	printf "            in the new script as desired.\n\n"
-	printf "        (7) Become the 'root' user, and execute the new script to\n"
+	printf "        (6) Become the 'root' user, and execute the new script to\n"
 	printf "            configure ALL six 'default' PKI subsystem instances.\n\n"
 	exit 255
 fi
@@ -971,7 +970,7 @@ fi
 ## (3) Make certain that 'pkisilent' exists and is executable on this system.
 if [ ! -x "/usr/bin/pkisilent" ] ; then
 	printf "\n"
-	printf "ERROR:  Please install the 'pki-silent' package and re-run\n"
+	printf "ERROR:  Please install the 'pki-server' package and re-run\n"
 	printf "the '$0' script!\n\n"
 	exit 255
 fi
diff --git a/base/silent/templates/subca_silent.template b/base/silent/templates/subca_silent.template
index 1475996d1..bbcc22552 100755
--- a/base/silent/templates/subca_silent.template
+++ b/base/silent/templates/subca_silent.template
@@ -22,15 +22,14 @@ if	[ "${subca_silent_script}" = "subca_silent.template" ] ; then
 	printf "        (3) Use 'pkicreate' to install a second CA subsystem\n"
 	printf "            instance (this will become a Subordinate CA).\n"
 	printf "            [Do NOT configure this CA subsystem instance!]\n\n"
-	printf "        (4) Install the 'pki-silent' package.\n\n"
-	printf "        (5) Copy '$0' to a new script name\n"
+	printf "        (4) Copy '$0' to a new script name\n"
 	printf "            without the '.template' extension.\n"
 	printf "            (e .g. - 'configure_subca_instance')\n\n"
-	printf "        (6) Fill in all MANDATORY user-defined variables\n"
+	printf "        (5) Fill in all MANDATORY user-defined variables\n"
 	printf "            in the new script.\n\n"
-	printf "        (7) Change any OPTIONAL user-defined variables\n"
+	printf "        (6) Change any OPTIONAL user-defined variables\n"
 	printf "            in the new script as desired.\n\n"
-	printf "        (8) Become the 'root' user, and execute the new script to\n"
+	printf "        (7) Become the 'root' user, and execute the new script to\n"
 	printf "            configure a Subordinate CA subsystem instance.\n\n"
 	exit 255
 fi
@@ -391,7 +390,7 @@ fi
 ## (3) Make certain that 'pkisilent' exists and is executable on this system.
 if [ ! -x "/usr/bin/pkisilent" ] ; then
 	printf "\n"
-	printf "ERROR:  Please install the 'pki-silent' package and re-run\n"
+	printf "ERROR:  Please install the 'pki-server' package and re-run\n"
 	printf "the '$0' script!\n\n"
 	exit 255
 fi