diff options
| author |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2023-06-13 16:28:51 +0200 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2023-06-13 16:28:51 +0200 |
| commit | ae8dfc1b1b610eff36b7e1b004a60601e08da309 (patch) | |
| tree | eaf23e348c99e8df5c483ee32d3826cf6b4a6dbf | |
| parent | 58b254f9cb923d5d0dfe53df4bca8a0f00bbcf0b (diff) | |
Fix OpenID Connect crash on ARM (#5463)
Only enable the Apache auth_openidc module when actually used
Fix https://github.com/FreshRSS/FreshRSS/issues/5460
Follow-up of https://github.com/FreshRSS/FreshRSS/pull/5351
| -rw-r--r-- | Docker/Dockerfile | 1 | ||||
| -rw-r--r-- | Docker/Dockerfile-QEMU-ARM | 1 | ||||
| -rwxr-xr-x | Docker/entrypoint.sh | 4 |
3 files changed, 6 insertions, 0 deletions
diff --git a/Docker/Dockerfile b/Docker/Dockerfile index b205b9d9c..b046d7fd9 100644 --- a/Docker/Dockerfile +++ b/Docker/Dockerfile @@ -36,6 +36,7 @@ LABEL \ org.opencontainers.image.version="$FRESHRSS_VERSION" RUN a2dismod -f alias autoindex negotiation status && \ + a2dismod auth_openidc && \ a2enmod deflate expires headers mime remoteip setenvif && \ a2disconf '*' && \ a2dissite '*' && \ diff --git a/Docker/Dockerfile-QEMU-ARM b/Docker/Dockerfile-QEMU-ARM index 7654a187d..e01989e2b 100644 --- a/Docker/Dockerfile-QEMU-ARM +++ b/Docker/Dockerfile-QEMU-ARM @@ -42,6 +42,7 @@ LABEL \ org.opencontainers.image.version="$FRESHRSS_VERSION" RUN a2dismod -f alias autoindex negotiation status && \ + a2dismod auth_openidc && \ a2enmod deflate expires headers mime remoteip setenvif && \ a2disconf '*' && \ a2dissite '*' && \ diff --git a/Docker/entrypoint.sh b/Docker/entrypoint.sh index cbc2443d6..6420ca219 100755 --- a/Docker/entrypoint.sh +++ b/Docker/entrypoint.sh @@ -11,6 +11,10 @@ if [ -n "$LISTEN" ]; then find /etc/apache2/ -type f -name FreshRSS.Apache.conf -exec sed -r -i "\\#^Listen#s#^.*#Listen $LISTEN#" {} \; fi +if [ -n "$OIDC_ENABLED" ] && [ "$OIDC_ENABLED" -ne 0 ]; then + a2enmod auth_openidc +fi + if [ -n "$CRON_MIN" ]; then ( echo "export TZ=$TZ" |