diff options
| author |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2025-10-02 21:15:51 +0200 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2025-10-02 21:15:51 +0200 |
| commit | 128c375fc9de5119b1963d92dc9cd3e423053111 (patch) | |
| tree | f30614b1c7de48d4ef7a308a979a8eb595ea3f67 /Docker | |
| parent | 032316155c03ca1013644476b8f9413ba436b744 (diff) | |
Debian 13 with OIDC fix (#8032)
Follow-up of https://github.com/FreshRSS/FreshRSS/pull/7772
fix https://github.com/FreshRSS/FreshRSS/issues/7860
fix https://github.com/FreshRSS/FreshRSS/issues/7798
Follow-up of https://github.com/FreshRSS/FreshRSS/pull/7805
PHP 8.4.11, Apache 2.4.65
* https://wiki.debian.org/DebianTrixie
* https://www.debian.org/releases/testing/release-notes/whats-new.en.html
* https://downloads.apache.org/httpd/CHANGES_2.4
And thanks to @CrazyWolf13 for [the debugging](https://github.com/OpenIDC/mod_auth_openidc/discussions/1349#discussioncomment-14542930)!
Co-authored-by: Tobias <96661824+CrazyWolf13@users.noreply.github.com>
Diffstat (limited to 'Docker')
| -rw-r--r-- | Docker/Dockerfile | 2 | ||||
| -rw-r--r-- | Docker/FreshRSS.Apache.conf | 9 |
2 files changed, 5 insertions, 6 deletions
diff --git a/Docker/Dockerfile b/Docker/Dockerfile index ab37b33a5..5da0e021a 100644 --- a/Docker/Dockerfile +++ b/Docker/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:12-slim +FROM debian:13-slim ENV TZ=UTC SHELL ["/bin/bash", "-o", "pipefail", "-c"] diff --git a/Docker/FreshRSS.Apache.conf b/Docker/FreshRSS.Apache.conf index 1b884f131..5868fae40 100644 --- a/Docker/FreshRSS.Apache.conf +++ b/Docker/FreshRSS.Apache.conf @@ -31,9 +31,9 @@ CustomLog "|/var/www/FreshRSS/cli/sensitive-log.sh" combined_proxy OIDCClientID ${OIDC_CLIENT_ID} OIDCClientSecret ${OIDC_CLIENT_SECRET} - OIDCSessionInactivityTimeout ${OIDC_SESSION_INACTIVITY_TIMEOUT} - OIDCSessionMaxDuration ${OIDC_SESSION_MAX_DURATION} - OIDCSessionType ${OIDC_SESSION_TYPE} + OIDCSessionInactivityTimeout ${OIDC_SESSION_INACTIVITY_TIMEOUT} + OIDCSessionMaxDuration ${OIDC_SESSION_MAX_DURATION} + OIDCSessionType ${OIDC_SESSION_TYPE} OIDCRedirectURI /i/oidc/ OIDCCryptoPassphrase ${OIDC_CLIENT_CRYPTO_KEY} @@ -57,8 +57,7 @@ CustomLog "|/var/www/FreshRSS/cli/sensitive-log.sh" combined_proxy OIDCXForwardedHeaders ${OIDC_X_FORWARDED_HEADERS} </IfDefine> - # Can be overridden e.g. in /var/www/FreshRSS/p/i/.htaccess - OIDCRefreshAccessTokenBeforeExpiry 30 + # Additional parameters can be set e.g. in /var/www/FreshRSS/p/i/.htaccess </IfDefine> <Directory /> |