diff --git a/.gitignore b/.gitignore index 822d63a..1fa6cfa 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ scripts/taler-monitoring/settings.conf # Local e2e/overrides — never commit (use secrets.env.example as template) scripts/taler-monitoring/secrets.env scripts/taler-monitoring/secrets.env.local +scripts/taler-monitoring/site-gen/settings.conf diff --git a/configs/caddy/Caddyfile b/configs/caddy/Caddyfile index 77b2f34..7b960b9 100644 --- a/configs/caddy/Caddyfile +++ b/configs/caddy/Caddyfile @@ -37,6 +37,22 @@ taler.hacktivism.ch { } } + # taler-monitoring console HTML (host static — not in app containers) + handle /monitoring_err { + redir /monitoring_err/ 302 + } + handle /monitoring_err/ { + root * /var/www/monitoring-sites/{host}/monitoring_err + file_server + } + handle /monitoring { + redir /monitoring/ 302 + } + handle /monitoring/ { + root * /var/www/monitoring-sites/{host}/monitoring + file_server + } + # SPA: /webui → /webui/ redir /webui /webui/ 302 @@ -62,6 +78,22 @@ exchange.hacktivism.ch { } } + # taler-monitoring console HTML (host static — not in app containers) + handle /monitoring_err { + redir /monitoring_err/ 302 + } + handle /monitoring_err/ { + root * /var/www/monitoring-sites/{host}/monitoring_err + file_server + } + handle /monitoring { + redir /monitoring/ 302 + } + handle /monitoring/ { + root * /var/www/monitoring-sites/{host}/monitoring + file_server + } + reverse_proxy 127.0.0.1:9011 { import proxy_public } @@ -79,6 +111,22 @@ bank.hacktivism.ch { } } + # taler-monitoring console HTML (host static — not in app containers) + handle /monitoring_err { + redir /monitoring_err/ 302 + } + handle /monitoring_err/ { + root * /var/www/monitoring-sites/{host}/monitoring_err + file_server + } + handle /monitoring { + redir /monitoring/ 302 + } + handle /monitoring/ { + root * /var/www/monitoring-sites/{host}/monitoring + file_server + } + # Static terms/privacy on landing nginx :9013 handle /terms* { reverse_proxy 127.0.0.1:9013 { diff --git a/host/caddy/Caddyfile b/host/caddy/Caddyfile index 77b2f34..7b960b9 100644 --- a/host/caddy/Caddyfile +++ b/host/caddy/Caddyfile @@ -37,6 +37,22 @@ taler.hacktivism.ch { } } + # taler-monitoring console HTML (host static — not in app containers) + handle /monitoring_err { + redir /monitoring_err/ 302 + } + handle /monitoring_err/ { + root * /var/www/monitoring-sites/{host}/monitoring_err + file_server + } + handle /monitoring { + redir /monitoring/ 302 + } + handle /monitoring/ { + root * /var/www/monitoring-sites/{host}/monitoring + file_server + } + # SPA: /webui → /webui/ redir /webui /webui/ 302 @@ -62,6 +78,22 @@ exchange.hacktivism.ch { } } + # taler-monitoring console HTML (host static — not in app containers) + handle /monitoring_err { + redir /monitoring_err/ 302 + } + handle /monitoring_err/ { + root * /var/www/monitoring-sites/{host}/monitoring_err + file_server + } + handle /monitoring { + redir /monitoring/ 302 + } + handle /monitoring/ { + root * /var/www/monitoring-sites/{host}/monitoring + file_server + } + reverse_proxy 127.0.0.1:9011 { import proxy_public } @@ -79,6 +111,22 @@ bank.hacktivism.ch { } } + # taler-monitoring console HTML (host static — not in app containers) + handle /monitoring_err { + redir /monitoring_err/ 302 + } + handle /monitoring_err/ { + root * /var/www/monitoring-sites/{host}/monitoring_err + file_server + } + handle /monitoring { + redir /monitoring/ 302 + } + handle /monitoring/ { + root * /var/www/monitoring-sites/{host}/monitoring + file_server + } + # Static terms/privacy on landing nginx :9013 handle /terms* { reverse_proxy 127.0.0.1:9013 {