summaryrefslogtreecommitdiffstats
path: root/base/ca/shared
diff options
context:
space:
mode:
authorEndi S. Dewata <edewata@redhat.com>2015-04-22 04:07:03 -0400
committerMatthew Harmsen <mharmsen@pki.usersys.redhat.com>2015-04-22 18:07:59 -0600
commit533b33a753801b3cc91529d83ac75f2214f86fcf (patch)
treea16fc0f61fb82d6a28e1a21e877f8d47c96647dc /base/ca/shared
parent4ff163c0d9c549a2eee4588fb9b25d19c2a3d3e4 (diff)
downloadpki-533b33a753801b3cc91529d83ac75f2214f86fcf.tar.gz
pki-533b33a753801b3cc91529d83ac75f2214f86fcf.tar.xz
pki-533b33a753801b3cc91529d83ac75f2214f86fcf.zip
Added direct deployment for all subsystems.
The deployment tool has been modified to deploy all subsystems directly from the /usr/share/pki. This will simplify updating the templates in the web applications. https://fedorahosted.org/pki/ticket/499
Diffstat (limited to 'base/ca/shared')
-rw-r--r--base/ca/shared/webapps/ca/WEB-INF/velocity.properties2
-rw-r--r--base/ca/shared/webapps/ca/ee/ca/ProfileSelect.template2
2 files changed, 2 insertions, 2 deletions
diff --git a/base/ca/shared/webapps/ca/WEB-INF/velocity.properties b/base/ca/shared/webapps/ca/WEB-INF/velocity.properties
index 2dfae4bca..d0c99b118 100644
--- a/base/ca/shared/webapps/ca/WEB-INF/velocity.properties
+++ b/base/ca/shared/webapps/ca/WEB-INF/velocity.properties
@@ -1,6 +1,6 @@
resource.loader = file
file.resource.loader.class = org.apache.velocity.runtime.resource.loader.FileResourceLoader
-file.resource.loader.path = [PKI_INSTANCE_PATH]/[PKI_WEBAPPS_NAME]/[PKI_SUBSYSTEM_TYPE]
+file.resource.loader.path = /usr/share/pki/ca/webapps/ca
file.resource.loader.cache = true
file.resource.loader.modificationCheckInterval = 2
input.encoding=UTF-8
diff --git a/base/ca/shared/webapps/ca/ee/ca/ProfileSelect.template b/base/ca/shared/webapps/ca/ee/ca/ProfileSelect.template
index 75678e91d..0e68e36e9 100644
--- a/base/ca/shared/webapps/ca/ee/ca/ProfileSelect.template
+++ b/base/ca/shared/webapps/ca/ee/ca/ProfileSelect.template
@@ -345,7 +345,7 @@ function setCRMFRequest()
var uri = 'profileSubmit';
if (typeof(authName) != "undefined") {
if (authIsSSLClientRequired == 'true') {
- uri = 'https://[PKI_HOSTNAME]:[PKI_EE_SECURE_CLIENT_AUTH_PORT_UI]/[PKI_SUBSYSTEM_TYPE]/eeca/[PKI_SUBSYSTEM_TYPE]/profileSubmitSSLClient';
+ uri = '/ca/eeca/ca/profileSubmitSSLClient';
}
}
if (navigator.appName == "Microsoft Internet Explorer") {