diff options
| author | Johan Lundberg <lundberg@nordu.net> | 2015-04-28 16:18:24 +0200 |
|---|---|---|
| committer | Johan Lundberg <lundberg@nordu.net> | 2015-04-28 16:18:24 +0200 |
| commit | 9c382611b69cf48e4063395b6bd84c8733b9dc67 (patch) | |
| tree | b6974a423dc92117f7607ffa3574df413dc8d399 /jetty_conf | |
| parent | eadb0ebe5eb0d1e5fcff88e8322f5e3a44d6c93f (diff) | |
Docker image now installing and running.
Diffstat (limited to 'jetty_conf')
| -rw-r--r-- | jetty_conf/idp.xml | 3 | ||||
| -rw-r--r-- | jetty_conf/ssl.mod | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/jetty_conf/idp.xml b/jetty_conf/idp.xml index cdeed1e..6d88f3d 100644 --- a/jetty_conf/idp.xml +++ b/jetty_conf/idp.xml @@ -1,7 +1,6 @@ <Configure class="org.eclipse.jetty.webapp.WebAppContext"> <Set name="war"> - <SystemProperty name="idp.home" /> - /war/idp.war + <SystemProperty name="idp.home" />/war/idp.war </Set> <Set name="contextPath">/idp</Set> <Set name="extractWAR">false</Set> diff --git a/jetty_conf/ssl.mod b/jetty_conf/ssl.mod index 77ceb76..e9bc03e 100644 --- a/jetty_conf/ssl.mod +++ b/jetty_conf/ssl.mod @@ -8,13 +8,17 @@ server [xml] etc/jetty-ssl.xml +[files] +/opt/shibboleth-idp/credentials/idp-browser.p12 + [ini-template] ### SSL Keystore Configuration # define the port to use for secure redirection jetty.secure.port=8443 -## Setup a demonstration keystore and truststore +## Setup a keystore jetty.keystore=/opt/shibboleth-idp/credentials/idp-browser.p12 +jetty.keystore.type=PKCS12 ## Set the demonstration passwords. ## Note that OBF passwords are not secure, just protected from casual observation |