diff options
| author |  нездалисько <105280814+crisukbot@users.noreply.github.com>
| 2024-08-14 09:55:29 +0300 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2024-08-14 08:55:29 +0200 |
| commit | b4ceabc2487b5677fc1bc49ae4cc3e449f77093a (patch) | |
| tree | 5debb04636acfa1052b183efc55cc00e138e67bd /Docker | |
| parent | 51f93e56f7ffc8fbae825124fe740ab623519e0c (diff) | |
add OIDCSessionMaxDuration and OIDCSessionInactivityTimeout (#6642)
* add OIDCSessionMaxDuration and OIDCSessionInactivityTimeout
* entrypoint.sh OIDCSessionMaxDuration and Session fix
* fix: entrypoint.sh OIDCSessionMaxDuration and OIDCSessionInactivityTimeout and Alpine support
* Use Apache config file instead
* Spelling
* fixed after restarting the double OIDC lines
* Refactor
---------
Co-authored-by: Alexandre Alapetite <alexandre@alapetite.fr>
Diffstat (limited to 'Docker')
| -rw-r--r-- | Docker/FreshRSS.Apache.conf | 1 | ||||
| -rwxr-xr-x | Docker/entrypoint.sh | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/Docker/FreshRSS.Apache.conf b/Docker/FreshRSS.Apache.conf index 49411441b..253f53614 100644 --- a/Docker/FreshRSS.Apache.conf +++ b/Docker/FreshRSS.Apache.conf @@ -53,6 +53,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 </IfDefine> diff --git a/Docker/entrypoint.sh b/Docker/entrypoint.sh index 7a12842a5..8784247cd 100755 --- a/Docker/entrypoint.sh +++ b/Docker/entrypoint.sh @@ -31,6 +31,8 @@ if [ -n "$OIDC_ENABLED" ] && [ "$OIDC_ENABLED" -ne 0 ]; then OIDC_SCOPES=$(echo "$OIDC_SCOPES" | tr ':' ' ') export OIDC_SCOPES fi + find /etc/apache2/*/ -type f -name '*openidc.conf' -exec sed -r -i "/^#?OIDCSessionInactivityTimeout/s/^.*/OIDCSessionInactivityTimeout ${OIDCSessionInactivityTimeout:-86400}/" {} \; + find /etc/apache2/*/ -type f -name '*openidc.conf' -exec sed -r -i "/^#?OIDCSessionMaxDuration/s/^.*/OIDCSessionMaxDuration ${OIDCSessionMaxDuration:-2592000}/" {} \; fi if [ -n "$CRON_MIN" ]; then |