diff options
| author |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2023-10-28 13:40:22 +0200 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2023-10-28 13:40:22 +0200 |
| commit | 51a95afdbbd43c69097c0452bacb049991a10ff9 (patch) | |
| tree | 6fb1d747adb7891b3a279a59127ab56fc5404a89 /Docker/entrypoint.sh | |
| parent | b228342b2f3c63d609ca3a9c8c1c2b8f649bba19 (diff) | |
Prepare Alpine OIDC (#5764)
* Prepare Alpine OIDC
* Prepare syntax for OpenID Connect in Alpine.
* Update :newest Alpine development image to PHP 8.3
* Fix a little bug in test of OIDC_SCOPES
* Changelog + syntax
* shellchecks
Diffstat (limited to 'Docker/entrypoint.sh')
| -rwxr-xr-x | Docker/entrypoint.sh | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/Docker/entrypoint.sh b/Docker/entrypoint.sh index 920fb2200..82cc4f9a8 100755 --- a/Docker/entrypoint.sh +++ b/Docker/entrypoint.sh @@ -22,9 +22,12 @@ if [ -n "$TRUSTED_PROXY" ]; then fi if [ -n "$OIDC_ENABLED" ] && [ "$OIDC_ENABLED" -ne 0 ]; then - a2enmod -q auth_openidc - if [ -n "$OIDC_ENABLED" ]; then - # Compatibility with : as separator instead of space: + # Debian + (which a2enmod >/dev/null && a2enmod -q auth_openidc) || + # Alpine + (mv /etc/apache2/conf.d/mod-auth-openidc.conf.bak /etc/apache2/conf.d/mod-auth-openidc.conf && echo 'Enabling module auth_openidc.') + if [ -n "$OIDC_SCOPES" ]; then + # Compatibility with : as separator instead of space OIDC_SCOPES=$(echo "$OIDC_SCOPES" | tr ':' ' ') export OIDC_SCOPES fi |