diff --git a/LocalSettings.php b/LocalSettings.php index 1772b3a..1786c13 100644 --- a/LocalSettings.php +++ b/LocalSettings.php @@ -640,6 +640,7 @@ function loadenv($envName, $default = "") { 'realNameAttribute' => 'urn:oid:2.16.840.1.113730.3.1.241', # mail attribute, email address 'emailAttribute' => 'urn:oid:0.9.2342.19200300.100.1.3', + # UBCAuth required attributes: # eduPersonAffiliation, an array of (staff, student, faculty, etc) 'eduPersonAffiliationAttribute' => 'urn:oid:1.3.6.1.4.1.5923.1.1.1.1', # non-standard attributes, uncertain OIDs diff --git a/docker-compose.yml b/docker-compose.yml index 3ec8032..8ff0ba2 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -54,7 +54,7 @@ services: - "traefik.enable=true" - "traefik.http.routers.sp.rule=PathPrefix(`/_saml2`)" - "traefik.http.routers.sp.entrypoints=wiki" - - "traefik.http.services.sp.loadBalancer.server.port=80" + - "traefik.http.services.sp.loadBalancer.server.port=8080" web: &app #image: ubcctlt/mediawiki build: . diff --git a/docker/simplesamlphp/sp/Dockerfile.sp b/docker/simplesamlphp/sp/Dockerfile.sp index d1645e0..d8b4161 100644 --- a/docker/simplesamlphp/sp/Dockerfile.sp +++ b/docker/simplesamlphp/sp/Dockerfile.sp @@ -33,10 +33,13 @@ RUN composer install && \ COPY config/ config/ COPY apache.conf /etc/apache2/sites-available/000-default.conf +COPY ports.conf /etc/apache2/ports.conf # copy our custom entrypoint COPY custom-entrypoint /usr/local/bin/ +EXPOSE 8080 + # The wiki extension expects the simplesamlphp SP to be installed on the same # server and will import modules from the running SP. But we want the SP to run # in its own container. The only way the wiki container will be able to access diff --git a/docker/simplesamlphp/sp/apache.conf b/docker/simplesamlphp/sp/apache.conf index 674462e..0d17191 100644 --- a/docker/simplesamlphp/sp/apache.conf +++ b/docker/simplesamlphp/sp/apache.conf @@ -1,4 +1,4 @@ - + # The ServerName directive sets the request scheme, hostname and port that # the server uses to identify itself. This is used when creating # redirection URLs. In the context of virtual hosts, the ServerName diff --git a/docker/simplesamlphp/sp/ports.conf b/docker/simplesamlphp/sp/ports.conf new file mode 100644 index 0000000..03d5dd2 --- /dev/null +++ b/docker/simplesamlphp/sp/ports.conf @@ -0,0 +1,15 @@ +# If you just change the port or add more ports here, you will likely also +# have to change the VirtualHost statement in +# /etc/apache2/sites-enabled/000-default.conf + +Listen 8080 + + + Listen 443 + + + + Listen 443 + + +# vim: syntax=apache ts=4 sw=4 sts=4 sr noet