Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

IDP-892 - enable modules using module.enable in config.php #188

Merged
merged 3 commits into from
Mar 19, 2024
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
10 changes: 3 additions & 7 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
forevermatt marked this conversation as resolved.
Show resolved Hide resolved

# Copy in SSP override files
ENV SSP_PATH /data/vendor/simplesamlphp/simplesamlphp
Expand Down
6 changes: 6 additions & 0 deletions development/idp-local/config/config.php
Original file line number Diff line number Diff line change
Expand Up @@ -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,
],


Expand Down
6 changes: 6 additions & 0 deletions development/idp2-local/config/config.php
Original file line number Diff line number Diff line change
Expand Up @@ -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,
],

/*
Expand Down
6 changes: 6 additions & 0 deletions development/sp-local/config/config.php
Original file line number Diff line number Diff line change
Expand Up @@ -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,
],

/*
Expand Down
6 changes: 6 additions & 0 deletions development/sp2-local/config/config.php
Original file line number Diff line number Diff line change
Expand Up @@ -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,
],

/*
Expand Down
6 changes: 6 additions & 0 deletions dockerbuild/ssp-overrides/config.php
Original file line number Diff line number Diff line change
Expand Up @@ -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,
],


Expand Down