Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

set ERROR_URL with environments #167

Merged
merged 1 commit into from
Nov 14, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Docker-compose/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
4 changes: 4 additions & 0 deletions Docker-compose/env.example
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
2 changes: 1 addition & 1 deletion example/proxy_conf.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Loading