Skip to content
Permalink
Browse files

Merge branch 'configuration-flex-auth' into 4.1

  • Loading branch information
lskublik
lskublik committed Apr 28, 2020
2 parents cc569bf + bc61be2 commit ff684b0a4f42610c497989c3777750d556f29192
Showing with 74 additions and 1,342 deletions.
  1. +0 −1 Dockerfile
  2. +0 −153 container_files/shibboleth/attribute-map.xml
  3. +0 −39 container_files/shibboleth/native.logger
  4. +0 −59 container_files/shibboleth/shibd.logger
  5. +11 −2 container_files/usr-local-bin/start-midpoint.sh
  6. +0 −1 demo/grouper/.env
  7. +0 −139 demo/grouper/configs-and-secrets/midpoint/shibboleth/shibboleth2.xml
  8. BIN demo/grouper/configs-and-secrets/midpoint/shibboleth/shibboleth_sp_keys.jks
  9. +0 −24 demo/grouper/configs-and-secrets/midpoint/shibboleth/sp-encrypt-cert.pem
  10. +0 −165 demo/grouper/configs-and-secrets/midpoint/shibboleth/sp-encrypt-key.pem
  11. +0 −24 demo/grouper/configs-and-secrets/midpoint/shibboleth/sp-signing-cert.pem
  12. +0 −165 demo/grouper/configs-and-secrets/midpoint/shibboleth/sp-signing-key.pem
  13. +3 −1 demo/grouper/docker-compose.yml
  14. +23 −147 ...er/midpoint_server/container_files/mp-home/post-initial-objects/securityPolicy/SecurityPolicy.xml
  15. +0 −139 demo/shibboleth/configs-and-secrets/midpoint/shibboleth/shibboleth2.xml
  16. BIN demo/shibboleth/configs-and-secrets/midpoint/shibboleth/shibboleth_sp_keys.jks
  17. +0 −24 demo/shibboleth/configs-and-secrets/midpoint/shibboleth/sp-encrypt-cert.pem
  18. +0 −40 demo/shibboleth/configs-and-secrets/midpoint/shibboleth/sp-encrypt-key.pem
  19. +0 −24 demo/shibboleth/configs-and-secrets/midpoint/shibboleth/sp-signing-cert.pem
  20. +0 −40 demo/shibboleth/configs-and-secrets/midpoint/shibboleth/sp-signing-key.pem
  21. +7 −4 demo/shibboleth/docker-compose-tests.yml
  22. +7 −4 demo/shibboleth/docker-compose.yml
  23. +23 −147 ...th/midpoint_server/container_files/mp-home/post-initial-objects/securityPolicy/SecurityPolicy.xml
@@ -22,7 +22,6 @@ RUN rm /etc/shibboleth/sp-signing-key.pem /etc/shibboleth/sp-signing-cert.pem /

COPY container_files/supervisor/supervisord.conf /etc/supervisor/supervisord.conf
COPY container_files/httpd/conf/* /etc/httpd/conf.d/
COPY container_files/shibboleth/* /etc/shibboleth/
COPY container_files/usr-local-bin/* /usr/local/bin/
COPY container_files/opt-tier/* /opt/tier/

This file was deleted.

This file was deleted.

This file was deleted.

@@ -8,6 +8,17 @@ function check () {
fi
}

echo "Linking secrets"
for filepath in /run/secrets/*; do
label_file=`basename $filepath`
if [ "$label_file" == "mp_shibboleth_sp_keys.jks" ]; then
if [ ! -d "/etc/pki/mp" ]; then
mkdir /etc/pki/mp
fi
ln -sf /run/secrets/mp_shibboleth_sp_keys.jks /etc/pki/mp/sp-shibboleth-keys.jks
fi
done

# These variables have reasonable defaults in Dockerfile. So we will _not_ supply defaults here.
# The composer or user has to make sure they are well defined.

@@ -20,7 +31,6 @@ check REPO_PASSWORD_FILE
check REPO_MISSING_SCHEMA_ACTION
check REPO_UPGRADEABLE_SCHEMA_ACTION
check MP_KEYSTORE_PASSWORD_FILE
check SSO_HEADER
check AJP_ENABLED
check AJP_PORT

@@ -40,7 +50,6 @@ java -Xmx$MP_MEM_MAX -Xms$MP_MEM_INIT -Dfile.encoding=UTF8 \
-Dmidpoint.logging.alt.enabled=true \
-Dmidpoint.logging.alt.filename=/tmp/logmidpoint \
-Dspring.profiles.active="`$MP_DIR/active-spring-profiles`" \
$(if [ "$AUTHENTICATION" = "shibboleth" ]; then echo "-Dauth.logout.url=$LOGOUT_URL -Dauth.sso.header=$SSO_HEADER"; fi) \
-Dserver.tomcat.ajp.enabled=$AJP_ENABLED \
-Dserver.tomcat.ajp.port=$AJP_PORT \
-Dlogging.path=/tmp/logtomcat \
@@ -9,5 +9,4 @@ REPO_MISSING_SCHEMA_ACTION=create
REPO_UPGRADEABLE_SCHEMA_ACTION=stop
MP_MEM_MAX=2048m
MP_MEM_INIT=1024m
SSO_HEADER=uid
TIMEZONE=UTC

0 comments on commit ff684b0

Please sign in to comment.
You can’t perform that action at this time.