diff --git a/Docker-compose/docker-compose.yml b/Docker-compose/docker-compose.yml index d454ef3b..ee335526 100644 --- a/Docker-compose/docker-compose.yml +++ b/Docker-compose/docker-compose.yml @@ -79,9 +79,9 @@ services: - SATOSA_PRIVATE_KEY=${SATOSA_KEYS_FOLDER:-./pki}/${SATOSA_PRIVATE_KEY_FILENAME:-privkey.pem} - SATOSA_PUBLIC_KEY=${SATOSA_KEYS_FOLDER:-./pki}/${SATOSA_PUBLIC_KEY_FILENAME:-cert.pem} - SATOSA_BASE=https://${SATOSA_HOSTNAME:-localhost} - - SATOSA_BASE_STATIC=https://${SATOSA_HOSTNAME:-localhost}/static - - SATOSA_DISCO_SRV=https://${SATOSA_HOSTNAME:-localhost}/static/disco.html - - SATOSA_UNKNOW_ERROR_REDIRECT_PAGE=https://${SATOSA_HOSTNAME:-localhost}/static/error_page.html + - SATOSA_BASE_STATIC=${SATOSA_BASE}/static + - SATOSA_DISCO_SRV=${SATOSA_BASE_STATIC}/disco.html + - SATOSA_UNKNOW_ERROR_REDIRECT_PAGE=${SATOSA_BASE_STATIC}/error_page.html - MONGODB_USERNAME=${MONGO_DBUSER:-satosa} - MONGODB_PASSWORD=${MONGO_DBPASSWORD:-thatpassword} diff --git a/Docker-compose/env.example b/Docker-compose/env.example index b71edc39..6a15f3c2 100644 --- a/Docker-compose/env.example +++ b/Docker-compose/env.example @@ -1,4 +1,8 @@ SATOSA_HOSTNAME=localhost +# SATOSA_BASE=https://${SATOSA_HOSTNAME:-localhost} +# SATOSA_BASE_STATIC=${SATOSA_BASE}/static +# SATOSA_DISCO_SRV=${SATOSA_BASE_STATIC}/disco.html +# SATOSA_UNKNOW_ERROR_REDIRECT_PAGE=${SATOSA_BASE_STATIC}/error_page.html # Set Time Zone TZ="Europe/Rome" diff --git a/example/proxy_conf.yaml b/example/proxy_conf.yaml index 0211bd13..b13046d9 100644 --- a/example/proxy_conf.yaml +++ b/example/proxy_conf.yaml @@ -18,7 +18,7 @@ cookies_samesite_compat: # DEPRECATED, use hasher microservice instead USER_ID_HASH_SALT: !ENV SATOSA_SALT -ERROR_URL: "https://localhost/static/error_page.html" +ERROR_URL: !ENV SATOSA_UNKNOW_ERROR_REDIRECT_PAGE CUSTOM_PLUGIN_MODULE_PATHS: #- "plugins/ping"