Merge pull request #188 from silinternational/feature/IDP-892

IDP-892 - enable modules using module.enable in config.php
silinternational · Mar 19, 2024 · 8b6b772 · 8b6b772
2 parents 7c46acd + e4502ff
commit 8b6b772
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 7 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -9,7 +9,7 @@ RUN apt-get update -y \
         php-gmp \
         php-memcached \
     && apt-get clean \
-    && rm -rf /var/lib/apt/lists/*    
+    && rm -rf /var/lib/apt/lists/*
 
 # Create required directories
 RUN mkdir -p /data
@@ -36,12 +36,8 @@ WORKDIR /data
 # Install/cleanup composer dependencies
 COPY composer.json /data/
 COPY composer.lock /data/
-# TODO/FIXME: Disabled the self-update due to a breaking change between composer 2.6.6 and 2.7.1 that affects the
-# loading of the simplesamlphp/simplesamlphp/modules folder. The Docker build fails on the sildisco/sspoverrides line.
-# It is not well understood what changed in composer, but since the overrides will need to be redesigned during
-# the SimpleSAMLphp 2.x upgrade, this issue is deferred until then.
-#RUN composer self-update --no-interaction
-RUN composer install --prefer-dist --no-interaction --no-dev --optimize-autoloader --no-scripts --no-progress
+RUN composer self-update --no-interaction
+RUN COMPOSER_ALLOW_SUPERUSER=1 composer install --prefer-dist --no-interaction --no-dev --optimize-autoloader --no-scripts --no-progress
 
 # Copy in SSP override files
 ENV SSP_PATH /data/vendor/simplesamlphp/simplesamlphp

diff --git a/development/idp-local/config/config.php b/development/idp-local/config/config.php
@@ -595,6 +595,12 @@
     'module.enable' => [
         // Setting to TRUE enables.
         'authgoogle' => $GOOGLE_ENABLE,
+        'expirychecker' => true,
+        'material' => true,
+        'mfa' => true,
+        'profilereview' => true,
+        'silauth' => true,
+        'sildisco' => true,
     ],
 
 

diff --git a/development/idp2-local/config/config.php b/development/idp2-local/config/config.php
@@ -327,6 +327,12 @@
     'module.enable' => [
         // Setting to TRUE enables.
         'authgoogle' => $GOOGLE_ENABLE,
+        'expirychecker' => true,
+        'material' => true,
+        'mfa' => true,
+        'profilereview' => true,
+        'silauth' => true,
+        'sildisco' => true,
     ],
 
     /*

diff --git a/development/sp-local/config/config.php b/development/sp-local/config/config.php
@@ -297,6 +297,12 @@
     'module.enable' => [
         // Setting to TRUE enables.
         'authgoogle' => $GOOGLE_ENABLE,
+        'expirychecker' => true,
+        'material' => true,
+        'mfa' => true,
+        'profilereview' => true,
+        'silauth' => true,
+        'sildisco' => true,
     ],
 
     /*

diff --git a/development/sp2-local/config/config.php b/development/sp2-local/config/config.php
@@ -297,6 +297,12 @@
     'module.enable' => [
         // Setting to TRUE enables.
         'authgoogle' => $GOOGLE_ENABLE,
+        'expirychecker' => true,
+        'material' => true,
+        'mfa' => true,
+        'profilereview' => true,
+        'silauth' => true,
+        'sildisco' => true,
     ],
 
     /*

diff --git a/dockerbuild/ssp-overrides/config.php b/dockerbuild/ssp-overrides/config.php
@@ -595,6 +595,12 @@
     'module.enable' => [
         // Setting to TRUE enables.
         'authgoogle' => $GOOGLE_ENABLE,
+        'expirychecker' => true,
+        'material' => true,
+        'mfa' => true,
+        'profilereview' => true,
+        'silauth' => true,
+        'sildisco' => true,
     ],