From eadb0ebe5eb0d1e5fcff88e8322f5e3a44d6c93f Mon Sep 17 00:00:00 2001
From: Johan Lundberg <lundberg@nordu.net>
Date: Thu, 9 Apr 2015 18:53:06 +0200
Subject: Added Jetty configuration and start command.

---
 start.sh | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'start.sh')

diff --git a/start.sh b/start.sh
index 3b48694..5c341f5 100644
--- a/start.sh
+++ b/start.sh
@@ -7,13 +7,17 @@ case "$*" in
     start)
         # Upgrade/Recreate war
         ./bin/install.sh -Didp.src.dir /opt/shibboleth-identity-provider-${IDP_VERSION}/ -Didp.target.dir /opt/shibboleth-idp
+	# Set Jetty tls cert password
+	sed -i "/jetty.keystore.password=/c\jetty.keystore.password=$PKCS12_PASSWORD" /opt/jetty/modules/ssl.mod
+	# Start Jetty
+	cd /opt/jetty/ && /usr/bin/java -jar start.jar
     ;;
     install)
-# Fresh install
+        # Fresh install
 cat>/tmp/entity_id<<EOF
 idp.entityID= ${ENTITY_ID}
 EOF
-    ./bin/install.sh -Didp.src.dir /opt/shibboleth-identity-provider-${IDP_VERSION}/ -Didp.target.dir /opt/shibboleth-idp -Didp.host.name ${HOSTNAME} -Didp.scope ${SCOPE} -Didp.sealer.password ${COOKIE_PASSWORD} -Didp.keystore.password ${TLS_PASSWORD} -Didp.merge.properties /tmp/entity_id -Didp.noprompt
+        ./bin/install.sh -Didp.src.dir /opt/shibboleth-identity-provider-${IDP_VERSION}/ -Didp.target.dir /opt/shibboleth-idp -Didp.host.name ${HOSTNAME} -Didp.scope ${SCOPE} -Didp.sealer.password ${COOKIE_PASSWORD} -Didp.keystore.password ${TLS_PASSWORD} -Didp.merge.properties /tmp/entity_id -Didp.noprompt
     ;;
     debug)
         /bin/bash
-- 
cgit v1.1