From 924403a14e92112c3c3d696319759b65eb57a30c Mon Sep 17 00:00:00 2001 From: Matthew Harmsen Date: Fri, 18 May 2012 10:52:06 -0700 Subject: PKI Deployment Scriptlets * Introduced concept of "admin-domain" originally as a separate folder, and later incorporated this concept into an optional instance prefix * Revised definition of to be identified as "[-] * Changed NSS security database model from one shared database by BOTH a single Tomcat AND single Apache instance into one per Tomcat instance (shared by CA/KRA/OCSP/TKS) and one per Apache instance (shared by RA/TPS) * Altered Configuration 'scriptlet' to invoke Jython for access to new Java configuration servlet * Renamed various "scriptlets" to comply with this new layout * Re-aligned code to account for revised layout documented at http://pki.fedoraproject.org/wiki/PKI_Instance_Deployment --- base/deploy/config/pkideployment.cfg | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) (limited to 'base/deploy/config/pkideployment.cfg') diff --git a/base/deploy/config/pkideployment.cfg b/base/deploy/config/pkideployment.cfg index 1122daa9f..c9c356043 100644 --- a/base/deploy/config/pkideployment.cfg +++ b/base/deploy/config/pkideployment.cfg @@ -1,43 +1,37 @@ [Common] -pki_source_root=/usr/share/pki -pki_instance_root=/var/lib/pki -pki_instance_log_root=/var/log/pki -pki_instance_configuration_root=/etc/pki -pki_instance_name=default +pki_admin_domain_name= pki_user=pkiuser pki_group=pkiuser pki_audit_group=pkiaudit [Apache] -pki_web_server=Apache +pki_instance_name=apache pki_http_port=80 pki_https_port=443 [Tomcat] -pki_web_server=Tomcat -pki_tomcat_root=/usr/share/tomcat -pki_tomcat_systemd=/usr/sbin/tomcat-sysd +pki_instance_name=tomcat pki_http_port=8080 pki_https_port=8443 pki_ajp_port=8009 -pki_proxy_https_port=443 pki_proxy_http_port=80 +pki_proxy_https_port=443 pki_security_manager=true [CA] pki_subsystem=CA pki_war_name=ca.war -tomcat_server_port=9701 +pki_tomcat_server_port=9701 [KRA] pki_subsystem=KRA pki_war_name=kra.war -tomcat_server_port=10701 +pki_tomcat_server_port=10701 [OCSP] pki_subsystem=OCSP pki_war_name=ocsp.war -tomcat_server_port=11701 +pki_tomcat_server_port=11701 [RA] pki_subsystem=RA [TKS] pki_subsystem=TKS pki_war_name=tks.war -tomcat_server_port=13701 +pki_tomcat_server_port=13701 [TPS] pki_subsystem=TPS -- cgit