diff options
author | Jesper Brix Rosenkilde <jbr@nordu.net> | 2017-07-06 15:46:41 +0200 |
---|---|---|
committer | Jesper Brix Rosenkilde <jbr@nordu.net> | 2017-07-06 15:46:41 +0200 |
commit | ff743a24f280268a98839a913d51712a66e4b321 (patch) | |
tree | 293e068fec5264ea85678e7f0356a1a146e0cf5f | |
parent | 26e0b943cd1976ccd6f8fd164feee09667aff744 (diff) |
Stop using stupid merge and allow run as jetty user
-rw-r--r-- | .gitignore | 1 | ||||
-rw-r--r-- | Dockerfile | 3 | ||||
-rw-r--r-- | install.properties | 8 |
3 files changed, 5 insertions, 7 deletions
@@ -1 +0,0 @@ -secrets.properties @@ -4,7 +4,6 @@ MAINTAINER Jesper B. Rosenkilde <jbr@nordu.net> ENV IDP_VERSION 3.3.0 COPY install.properties /opt/ -COPY secrets.properties /opt/ COPY shibboleth-identity-provider-${IDP_VERSION}.tar.gz.sha256 /opt/ COPY shibboleth.db.ddl /tmp/ WORKDIR /opt @@ -17,6 +16,8 @@ RUN apk --no-cache add bash apache-ant sqlite curl && \ apk --no-cache del apache-ant && \ rm -rf shibboleth-identity-provider* install.properties +RUN chown -R jetty:jetty /opt/shibboleth-idp + #RUN mkdir -p persistent-id && sqlite3 persistent-id/shibboleth.db < /tmp/shibboleth.db.ddl && rm -f /tmp/shibboleth.db.ddl diff --git a/install.properties b/install.properties index f91b3ed..2826a8c 100644 --- a/install.properties +++ b/install.properties @@ -2,8 +2,6 @@ idp.src.dir=/opt/shibboleth-identity-provider idp.target.dir=/opt/shibboleth-idp idp.host.name=idp.nordu.dev idp.scope=nordu.dev -idp.entityID=https://idp.nordu.dev/idp/shibboleth -idp.merge.properties=/opt/secrets.properties -idp.noprompt=true -idp.sealer.password=true -idp.keystore.password=true +# Shibboleth default password, don't change not used on runtime +idp.sealer.password=password +idp.keystore.password=password |