Pārlūkot izejas kodu

OIDC_SCOPES compatibility colon (#5753)

fix https://github.com/FreshRSS/FreshRSS/issues/5744
Alexandre Alapetite 2 gadi atpakaļ
vecāks
revīzija
ce6ba583be
3 mainītis faili ar 7 papildinājumiem un 2 dzēšanām
  1. 1 1
      CHANGELOG.md
  2. 5 0
      Docker/entrypoint.sh
  3. 1 1
      docs/en/admins/16_OpenID-Connect.md

+ 1 - 1
CHANGELOG.md

@@ -6,7 +6,7 @@
 ## 2023-10-23 FreshRSS 1.22.0
 
 * Features
-	* Add support for OpenID Connect (only in our Debian-based Docker image) through [`libapache2-mod-auth-openidc`](https://github.com/OpenIDC/mod_auth_openidc)
+	* Add support for OpenID Connect (only in our default Debian-based Docker image for x86_64, not Alpine) through [`libapache2-mod-auth-openidc`](https://github.com/OpenIDC/mod_auth_openidc)
 		[#5351](https://github.com/FreshRSS/FreshRSS/pull/5351), [#5463](https://github.com/FreshRSS/FreshRSS/pull/5463), [#5481](https://github.com/FreshRSS/FreshRSS/pull/5481),
 		[#5523](https://github.com/FreshRSS/FreshRSS/pull/5523), [#5646](https://github.com/FreshRSS/FreshRSS/pull/5646)
 	* Allow sharing in anonymous mode [#5261](https://github.com/FreshRSS/FreshRSS/pull/5261)

+ 5 - 0
Docker/entrypoint.sh

@@ -23,6 +23,11 @@ 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:
+		OIDC_SCOPES=$(echo "$OIDC_SCOPES" | tr ':' ' ')
+		export OIDC_SCOPES
+	fi
 fi
 
 if [ -n "$CRON_MIN" ]; then

+ 1 - 1
docs/en/admins/16_OpenID-Connect.md

@@ -13,7 +13,7 @@ The callback URL is `https://<your-domain>/i/oidc/`.
 
 OIDC support in Docker is activated by the presence of a non-empty non-zero `OIDC_ENABLED` environment variable.
 
-> ℹ️ Only available in our Debian image for `x86_64` ([help welcome](https://github.com/FreshRSS/FreshRSS/issues/5722)).
+> ℹ️ Only available in our default Debian image (not Alpine) for `x86_64` ([help welcome](https://github.com/FreshRSS/FreshRSS/issues/5722)).
 
 ## The config is done with these environment variables