diff options
author | Ade Lee <alee@redhat.com> | 2012-08-15 22:53:51 -0400 |
---|---|---|
committer | Rob Crittenden <rcritten@redhat.com> | 2012-09-17 18:43:36 -0400 |
commit | 3dd31a875650c7fe7c67ca6b47f2058c1181dafb (patch) | |
tree | 137f46dfe1684ebcbd6e9e70ef3c5a690ab32d07 /install/conf | |
parent | 79b89f41962985cf0ab96238b21409b5874f67f8 (diff) | |
download | freeipa-3dd31a875650c7fe7c67ca6b47f2058c1181dafb.tar.gz freeipa-3dd31a875650c7fe7c67ca6b47f2058c1181dafb.tar.xz freeipa-3dd31a875650c7fe7c67ca6b47f2058c1181dafb.zip |
Modifications to install scripts for dogtag 10
Dogtag 10 uses a new installer, new directory layout and new default
ports. This patch changes the ipa install code to integrate these changes.
https://fedorahosted.org/freeipa/ticket/2846
Diffstat (limited to 'install/conf')
-rw-r--r-- | install/conf/ipa-pki-proxy.conf | 16 | ||||
-rw-r--r-- | install/conf/ipa.conf | 4 |
2 files changed, 10 insertions, 10 deletions
diff --git a/install/conf/ipa-pki-proxy.conf b/install/conf/ipa-pki-proxy.conf index 91a99aaf..7a067ca9 100644 --- a/install/conf/ipa-pki-proxy.conf +++ b/install/conf/ipa-pki-proxy.conf @@ -6,22 +6,22 @@ ProxyRequests Off <LocationMatch "^/ca/ee/ca/checkRequest|^/ca/ee/ca/getCertChain|^/ca/ee/ca/getTokenInfo|^/ca/ee/ca/tokenAuthenticate|^/ca/ocsp|^/ca/ee/ca/updateNumberRange"> NSSOptions +StdEnvVars +ExportCertData +StrictRequire +OptRenegotiate NSSVerifyClient none - ProxyPassMatch ajp://localhost:9447/ - ProxyPassReverse ajp://localhost:9447/ + ProxyPassMatch ajp://localhost:8009 + ProxyPassReverse ajp://localhost:8009 </LocationMatch> -# matches for admin port -<LocationMatch "^/ca/admin/ca/getCertChain|^/ca/admin/ca/getConfigEntries|^/ca/admin/ca/getCookie|^/ca/admin/ca/getStatus|^/ca/admin/ca/securityDomainLogin|^/ca/admin/ca/getDomainXML"> +# matches for admin port and installer +<LocationMatch "^/ca/admin/ca/getCertChain|^/ca/admin/ca/getConfigEntries|^/ca/admin/ca/getCookie|^/ca/admin/ca/getStatus|^/ca/admin/ca/securityDomainLogin|^/ca/admin/ca/getDomainXML|^/ca/rest/installer/installToken"> NSSOptions +StdEnvVars +ExportCertData +StrictRequire +OptRenegotiate NSSVerifyClient none - ProxyPassMatch ajp://localhost:9447/ - ProxyPassReverse ajp://localhost:9447/ + ProxyPassMatch ajp://localhost:8009 + ProxyPassReverse ajp://localhost:8009 </LocationMatch> # matches for agent port and eeca port <LocationMatch "^/ca/agent/ca/displayBySerial|^/ca/agent/ca/doRevoke|^/ca/agent/ca/doUnrevoke|^/ca/agent/ca/updateDomainXML|^/ca/eeca/ca/profileSubmitSSLClient"> NSSOptions +StdEnvVars +ExportCertData +StrictRequire +OptRenegotiate NSSVerifyClient require - ProxyPassMatch ajp://localhost:9447/ - ProxyPassReverse ajp://localhost:9447/ + ProxyPassMatch ajp://localhost:8009 + ProxyPassReverse ajp://localhost:8009 </LocationMatch> diff --git a/install/conf/ipa.conf b/install/conf/ipa.conf index 1b31a52a..d428460f 100644 --- a/install/conf/ipa.conf +++ b/install/conf/ipa.conf @@ -105,8 +105,8 @@ Alias /ipa/config "/usr/share/ipa/html" # For CRL publishing -Alias /ipa/crl "/var/lib/pki-ca/publish" -<Directory "/var/lib/pki-ca/publish"> +Alias /ipa/crl "/var/lib/pki/tomcat-ca/ca/publish" +<Directory "/var/lib/pki/tomcat-ca/ca/publish"> SetHandler None AllowOverride None Options Indexes FollowSymLinks |