Skip to content

Cspwb 19 #58

Merged
merged 7 commits into from
Dec 14, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Workbench/configs-and-secrets/wordpress/httpd/shib.conf
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ ShibCompatValidUser Off
#
# Ensures handler will be accessible.
#
<Location /registrySSO/Shibboleth.sso>
<Location /wordpresssSSO/Shibboleth.sso>
AuthType None
Require all granted
SetHandler shib
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
cookieProps to "https" for SSL-only sites. Note that while we default checkAddress to
"false", this makes an assertion stolen in transit easier for attackers to misuse.
-->
<Sessions lifetime="28800" timeout="3600" relayState="ss:mem" handlerURL="/registrySSO/Shibboleth.sso"
<Sessions lifetime="28800" timeout="3600" relayState="ss:mem" handlerURL="/wordpressSSO/Shibboleth.sso"
checkAddress="false" handlerSSL="true" cookieProps="https"
redirectLimit="exact">

Expand Down
7 changes: 5 additions & 2 deletions Workbench/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -293,14 +293,18 @@ services:

wordpress_server:
build: ./wordpress_server/
container_name: wordpress_server
networks:
- net
depends_on:
- wordpress_data
command: bash -c 'if [ ! -s /var/www/html/wp-config.php ]; then while ! nc -z wordpress_data 3306 ; do echo waiting for mysql on wordpress_data to start; sleep 3; done; /root/wp core download --allow-root && sleep 10 && /root/wp config create --dbname=wordpress --dbuser=wordpress --dbpass=54y6RxN7GfC7aes3 --dbhost=wordpress_data --allow-root; sleep 3 && /root/wp core install --url="http://localhost/" --title="wordpress" --admin_user="admin" --admin_password="54y6RxN7GfC7aes3" --admin_email="sentrifugo.container@gmail.com" --allow-root && /root/wp --allow-root rewrite structure "/%postname%" --hard --debug; /root/wp rewrite flush --hard --debug --allow-root && sed -i "s/<\/IfModule>/RewriteCond \%{HTTP:Authorization} \^\(\.\*\)\nRewriteRule \^\(\.\*\) - [E=HTTP_AUTHORIZATION:\%1]\n<\/IfModule>\nSetEnvIf Authorization "\(\.\*\)" HTTP_AUTHORIZATION=\$$1/" /var/www/html/.htaccess && /root/sed.sh && /root/wp plugin install jwt-authentication-for-wp-rest-api --activate --allow-root && /root/wp plugin install wp-rest-api-log --activate --allow-root && /root/wp plugin install shibboleth --activate --allow-root; fi; /usr/local/bin/startup.sh;'
ports:
- "80:80"
healthcheck:
test: curl -s wordpress_server:80
interval: 30s
timeout: 30s
retries: 3
devices:
- "/dev/tty:/dev/tty"
volumes:
Expand All @@ -320,7 +324,6 @@ services:

wordpress_data:
build: ./wordpress_data/
container_name: wordpress_data
networks:
- net
volumes:
Expand Down

This file was deleted.

2 changes: 1 addition & 1 deletion Workbench/wordpress_server/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM tier/shibboleth_sp:3.0.4_03122019
FROM tier/shibboleth_sp:latest

VOLUME /var/www/html

Expand Down