diff options
| author | Endi S. Dewata <edewata@redhat.com> | 2015-04-22 04:07:03 -0400 |
|---|---|---|
| committer | Matthew Harmsen <mharmsen@pki.usersys.redhat.com> | 2015-04-22 18:07:59 -0600 |
| commit | 533b33a753801b3cc91529d83ac75f2214f86fcf (patch) | |
| tree | a16fc0f61fb82d6a28e1a21e877f8d47c96647dc /base/tks | |
| parent | 4ff163c0d9c549a2eee4588fb9b25d19c2a3d3e4 (diff) | |
| download | pki-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/tks')
| -rw-r--r-- | base/tks/shared/webapps/tks/WEB-INF/velocity.properties | 2 | ||||
| -rw-r--r-- | base/tks/tomcat7/conf/Catalina/localhost/tks.xml | 2 | ||||
| -rw-r--r-- | base/tks/tomcat8/conf/Catalina/localhost/tks.xml | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/base/tks/shared/webapps/tks/WEB-INF/velocity.properties b/base/tks/shared/webapps/tks/WEB-INF/velocity.properties index 5cd0454cc..65f7f706b 100644 --- a/base/tks/shared/webapps/tks/WEB-INF/velocity.properties +++ b/base/tks/shared/webapps/tks/WEB-INF/velocity.properties @@ -5,7 +5,7 @@ # 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/tks/webapps/tks file.resource.loader.cache = true file.resource.loader.modificationCheckInterval = 2 input.encoding=UTF-8 diff --git a/base/tks/tomcat7/conf/Catalina/localhost/tks.xml b/base/tks/tomcat7/conf/Catalina/localhost/tks.xml index e838503a6..f11add6cb 100644 --- a/base/tks/tomcat7/conf/Catalina/localhost/tks.xml +++ b/base/tks/tomcat7/conf/Catalina/localhost/tks.xml @@ -22,7 +22,7 @@ See the License for the specific language governing permissions and limitations under the License. --> -<Context crossContext="true" allowLinking="true"> +<Context docBase="/usr/share/pki/tks/webapps/tks" crossContext="true" allowLinking="true"> <Manager secureRandomProvider="Mozilla-JSS" secureRandomAlgorithm="pkcs11prng"/> diff --git a/base/tks/tomcat8/conf/Catalina/localhost/tks.xml b/base/tks/tomcat8/conf/Catalina/localhost/tks.xml index 2c045dec7..0364ed3a0 100644 --- a/base/tks/tomcat8/conf/Catalina/localhost/tks.xml +++ b/base/tks/tomcat8/conf/Catalina/localhost/tks.xml @@ -22,7 +22,7 @@ See the License for the specific language governing permissions and limitations under the License. --> -<Context crossContext="true"> +<Context docBase="/usr/share/pki/tks/webapps/tks" crossContext="true"> <Manager secureRandomProvider="Mozilla-JSS" secureRandomAlgorithm="pkcs11prng"/> |