summaryrefslogtreecommitdiffstats
path: root/base/deploy/etc/default.cfg
diff options
context:
space:
mode:
authorEndi Sukma Dewata <edewata@redhat.com>2012-12-18 14:46:41 -0500
committerEndi Sukma Dewata <edewata@redhat.com>2013-01-03 16:56:03 -0500
commit359105b3055ecbbc00992be6fa203d5c52fc8818 (patch)
tree46b9afd029ee9824986550af71c91bfc3d6b588b /base/deploy/etc/default.cfg
parent01bbfc224a228206fbe18318b2a23363fa9663cc (diff)
downloadpki-359105b3055ecbbc00992be6fa203d5c52fc8818.tar.gz
pki-359105b3055ecbbc00992be6fa203d5c52fc8818.tar.xz
pki-359105b3055ecbbc00992be6fa203d5c52fc8818.zip
Added interactive subsystem installation.ticket-380-4
The pkispawn has been modified such that if there is no configuration file specified it will enter an interactive mode. The pkidestroy has been modified such that if the instance name or subsystem type is not specified it will enter an interactive mode. Ticket #380
Diffstat (limited to 'base/deploy/etc/default.cfg')
-rw-r--r--base/deploy/etc/default.cfg6
1 files changed, 3 insertions, 3 deletions
diff --git a/base/deploy/etc/default.cfg b/base/deploy/etc/default.cfg
index 238912fcb..3292fe429 100644
--- a/base/deploy/etc/default.cfg
+++ b/base/deploy/etc/default.cfg
@@ -57,12 +57,12 @@ destroy_scriplets=
# case someone wants to override them in their config file.
#
# Tomcat instances:
-# pki_instance_name=pki_tomcat
+# pki_instance_name=pki-tomcat
# pki_https_port=8443
# pki_http_port=8080
#
# Apache instances:
-# pki_instance_name=pki_tomcat
+# pki_instance_name=pki-apache
# pki_https_port=443
# pki_http_port=80
@@ -125,7 +125,7 @@ pki_client_pkcs12_password_conf=%(pki_client_subsystem_dir)s/pkcs12_password.con
pki_client_cert_database=%(pki_client_database_dir)s/cert8.db
pki_client_key_database=%(pki_client_database_dir)s/key3.db
pki_client_secmod_database=%(pki_client_database_dir)s/secmod.db
-pki_client_admin_cert=%(pki_subsystem_type)s_admin.cert
+pki_client_admin_cert=%(pki_client_dir)s/%(pki_subsystem_type)s_admin.cert
pki_source_conf_path=/usr/share/pki/%(pki_subsystem_type)s/conf
pki_source_setup_path=/usr/share/pki/setup
pki_source_server_path=/usr/share/pki/server/conf