summaryrefslogtreecommitdiffstats
path: root/base/ca/shared
diff options
context:
space:
mode:
authorMatthew Harmsen <mharmsen@pki.usersys.redhat.com>2016-05-04 16:25:14 -0600
committerMatthew Harmsen <mharmsen@pki.usersys.redhat.com>2016-05-04 16:32:22 -0600
commit8037777298814440227451931eb607c5226cd35c (patch)
tree93c3f5726e9cba017e7c1b5b91890cab87e7e12e /base/ca/shared
parente6e10fa226d3fb6d01f5f8bea193508559372968 (diff)
downloadpki-8037777298814440227451931eb607c5226cd35c.tar.gz
pki-8037777298814440227451931eb607c5226cd35c.tar.xz
pki-8037777298814440227451931eb607c5226cd35c.zip
Fixed adminEnroll servlet browser import issue
- PKI TRAC Ticket #1669 - adminEnroll servlet EnrollSuccess.template succeeds but fails on import into browser
Diffstat (limited to 'base/ca/shared')
-rw-r--r--base/ca/shared/conf/CS.cfg.in4
-rw-r--r--base/ca/shared/webapps/ca/WEB-INF/web.xml6
2 files changed, 5 insertions, 5 deletions
diff --git a/base/ca/shared/conf/CS.cfg.in b/base/ca/shared/conf/CS.cfg.in
index 3f25d0ec3..1a1f65341 100644
--- a/base/ca/shared/conf/CS.cfg.in
+++ b/base/ca/shared/conf/CS.cfg.in
@@ -745,14 +745,14 @@ cmsgateway._002=## for a given instance, perform the following steps to
cmsgateway._003=## re-enroll for a new Admin Certificate:
cmsgateway._004=##
cmsgateway._005=## (1) Become 'root'
-cmsgateway._006=## (2) Type: 'service [PKI_INSTANCE_NAME] stop'
+cmsgateway._006=## (2) Type: 'systemctl stop pki-tomcatd@[PKI_INSTANCE_NAME].service'
cmsgateway._007=## (3) Edit '[PKI_CFG_PATH_NAME]'
cmsgateway._008=## and set the following name-value pairs (if necessary):
cmsgateway._009=##
cmsgateway._010=## ca.Policy.enable=true
cmsgateway._011=## cmsgateway.enableAdminEnroll=true
cmsgateway._012=##
-cmsgateway._013=## (4) Type: 'service [PKI_INSTANCE_NAME] start'
+cmsgateway._013=## (4) Type: 'systemctl start pki-tomcatd@[PKI_INSTANCE_NAME].service'
cmsgateway._014=## (5) Launch a browser and re-enroll for
cmsgateway._015=## a new Admin Certificate by typing:
cmsgateway._016=##
diff --git a/base/ca/shared/webapps/ca/WEB-INF/web.xml b/base/ca/shared/webapps/ca/WEB-INF/web.xml
index 628eea2a2..d887db46b 100644
--- a/base/ca/shared/webapps/ca/WEB-INF/web.xml
+++ b/base/ca/shared/webapps/ca/WEB-INF/web.xml
@@ -451,7 +451,7 @@
<init-param><param-name> GetClientCert </param-name>
<param-value> true </param-value> </init-param>
<init-param><param-name> successTemplate </param-name>
- <param-value> /ca/ImportCert.template </param-value> </init-param>
+ <param-value> /agent/ca/ImportCert.template </param-value> </init-param>
<init-param><param-name> AuthzMgr </param-name>
<param-value> BasicAclAuthz </param-value> </init-param>
<init-param><param-name> authority </param-name>
@@ -1868,7 +1868,7 @@
<servlet-mapping>
<servlet-name> caGetAdminCertBySerial </servlet-name>
- <url-pattern> /ca/getAdminCertBySerial </url-pattern>
+ <url-pattern> /getAdminCertBySerial </url-pattern>
</servlet-mapping>
<servlet-mapping>
@@ -1988,7 +1988,7 @@
<servlet-mapping>
<servlet-name> caGetBySerial-agent </servlet-name>
- <url-pattern> /ca/getBySerial </url-pattern>
+ <url-pattern> /agent/ca/getBySerial </url-pattern>
</servlet-mapping>
<servlet-mapping>