diff options
| author | Endi Sukma Dewata <edewata@redhat.com> | 2012-12-18 14:46:41 -0500 |
|---|---|---|
| committer | Endi Sukma Dewata <edewata@redhat.com> | 2013-01-29 17:24:58 -0500 |
| commit | 53b6f1d1dabff720c68eb7615830476b97f973cc (patch) | |
| tree | beab24e89cde7d2a3337cf9e311add33ed689256 /base/deploy/etc/default.cfg | |
| parent | a076bc976666f1713b3f2e3982f4700b88397e74 (diff) | |
| download | pki-ticket-380-7.tar.gz pki-ticket-380-7.tar.xz pki-ticket-380-7.zip | |
Added interactive subsystem installation.ticket-380-7
The pkispawn has been modified such that the configuration file
and subsystem type are optional. The pkidestroy has been modified
such that the instance name and subsystem type are optional.
If any of these options are not specified they will enter an
interactive mode.
Ticket #380
Diffstat (limited to 'base/deploy/etc/default.cfg')
| -rw-r--r-- | base/deploy/etc/default.cfg | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/base/deploy/etc/default.cfg b/base/deploy/etc/default.cfg index 3106ba53f..9dfc4b29b 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 @@ -91,13 +91,16 @@ pki_ds_password= pki_ds_remove_data=True pki_ds_secure_connection=False pki_group=pkiuser -pki_issuing_ca= +pki_issuing_ca_hostname=%(pki_security_domain_hostname)s +pki_issuing_ca_https_port=%(pki_security_domain_https_port)s +pki_issuing_ca_uri=https://%(pki_issuing_ca_hostname)s:%(pki_issuing_ca_https_port)s +pki_issuing_ca=%(pki_issuing_ca_uri)s pki_restart_configured_instance=True pki_security_domain_hostname=%(pki_hostname)s pki_security_domain_https_port=8443 pki_security_domain_name=%(pki_dns_domainname)s Security Domain pki_security_domain_password= -pki_security_domain_user= +pki_security_domain_user=caadmin pki_skip_configuration=False pki_skip_installation=False pki_ssl_server_key_algorithm=SHA256withRSA @@ -125,7 +128,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 |