diff --git a/volumes/conf.d/code.zinomedia.de.conf b/volumes/conf.d/code.zinomedia.de.conf index 671ffb6..d83ee13 100644 --- a/volumes/conf.d/code.zinomedia.de.conf +++ b/volumes/conf.d/code.zinomedia.de.conf @@ -1,11 +1,12 @@ -log_format custom2 '[$time_iso8601] CODE | request_uri: $request_uri | status: $status | http_host: $http_host | auth_resp_x_vouch_user: $auth_resp_x_vouch_user | upstream_http_x_vouch_user: $upstream_http_x_vouch_user | auth_resp_jwt: $auth_resp_jwt | upstream_http_x_vouch_jwt: $upstream_http_x_vouch_jwt | auth_resp_err: $auth_resp_err | upstream_http_x_vouch_err: $upstream_http_x_vouch_err | auth_resp_failcount: $auth_resp_failcount | upstream_http_x_vouch_failcount: $upstream_http_x_vouch_failcount'; +#log_format custom2 '[$time_iso8601] CODE | request_uri: $request_uri | status: $status | http_host: $http_host | auth_resp_x_vouch_user: $auth_resp_x_vouch_user | upstream_http_x_vouch_user: $upstream_http_x_vouch_user | auth_resp_jwt: $auth_resp_jwt | upstream_http_x_vouch_jwt: $upstream_http_x_vouch_jwt | auth_resp_err: $auth_resp_err | upstream_http_x_vouch_err: $upstream_http_x_vouch_err | auth_resp_failcount: $auth_resp_failcount | upstream_http_x_vouch_failcount: $upstream_http_x_vouch_failcount'; server { listen 443 ssl; listen [::]:443 ssl; server_name code.zinomedia.de; - access_log /var/log/nginx/access.log custom2; + #access_log /var/log/nginx/access.log custom2; + access_log off; error_log /var/log/nginx/error.log debug; ssl_certificate /etc/letsencrypt/live/code.zinomedia.de/fullchain.pem; @@ -20,9 +21,8 @@ server { add_header Strict-Transport-Security "max-age=31536000; includeSubDomains" always; add_header Content-Security-Policy "default-src 'self'; script-src 'self' 'unsafe-inline' 'unsafe-eval'; img-src 'self' data:; style-src 'self' 'unsafe-inline'; font-src 'self' data:;" always; - #include "snippets/enable-vouch-no-subdomain.conf"; include "snippets/enable-vouch.conf"; - + location / { resolver 127.0.0.11; set $upstream "http://code-server:8443"; diff --git a/volumes/conf.d/portainer.armos.zinomedia.de.conf b/volumes/conf.d/portainer.armos.zinomedia.de.conf index 050eeba..1a0d00e 100644 --- a/volumes/conf.d/portainer.armos.zinomedia.de.conf +++ b/volumes/conf.d/portainer.armos.zinomedia.de.conf @@ -16,6 +16,8 @@ server { ssl_session_cache shared:SSL:10m; ssl_session_timeout 10m; + include "snippets/enable-vouch.conf"; + location / { resolver 127.0.0.11; set $upstream "portainer:9000"; diff --git a/volumes/conf.d/validate.vouch.armos.zinomedia.de.conf b/volumes/conf.d/validate.vouch.armos.zinomedia.de.conf index 1383164..e5bc1c4 100644 --- a/volumes/conf.d/validate.vouch.armos.zinomedia.de.conf +++ b/volumes/conf.d/validate.vouch.armos.zinomedia.de.conf @@ -1,11 +1,12 @@ -log_format custom '[$time_iso8601] VALIDATE | host: $host | request_uri: $request_uri | status: $status | http_host: $http_host | auth_resp_x_vouch_user: $auth_resp_x_vouch_user | upstream_http_x_vouch_user: $upstream_http_x_vouch_user | auth_resp_jwt: $auth_resp_jwt | upstream_http_x_vouch_jwt: $upstream_http_x_vouch_jwt | auth_resp_err: $auth_resp_err | upstream_http_x_vouch_err: $upstream_http_x_vouch_err | auth_resp_failcount: $auth_resp_failcount | upstream_http_x_vouch_failcount: $upstream_http_x_vouch_failcount'; +#log_format custom '[$time_iso8601] VALIDATE | host: $host | request_uri: $request_uri | status: $status | http_host: $http_host | auth_resp_x_vouch_user: $auth_resp_x_vouch_user | upstream_http_x_vouch_user: $upstream_http_x_vouch_user | auth_resp_jwt: $auth_resp_jwt | upstream_http_x_vouch_jwt: $upstream_http_x_vouch_jwt | auth_resp_err: $auth_resp_err | upstream_http_x_vouch_err: $upstream_http_x_vouch_err | auth_resp_failcount: $auth_resp_failcount | upstream_http_x_vouch_failcount: $upstream_http_x_vouch_failcount'; server { listen 443 ssl; listen [::]:443 ssl; server_name validate.vouch.armos.zinomedia.de; - access_log /var/log/nginx/access.log custom; + #access_log /var/log/nginx/access.log custom; + access_log off; error_log /var/log/nginx/error.log error; ssl_certificate /etc/letsencrypt/live/validate.vouch.armos.zinomedia.de/fullchain.pem; @@ -24,74 +25,7 @@ server { # be sure to pass the original host header proxy_set_header Host $http_host; - - #proxy_set_header Host zinomedia.de; - - # # Vouch Proxy only acts on the request headers - # proxy_pass_request_body off; - # proxy_set_header Content-Length ""; - - # # optionally add X-Vouch-User as returned by Vouch Proxy along with the request - # auth_request_set $auth_resp_x_vouch_user $upstream_http_x_vouch_user; - - # # these return values are used by the @error401 call - # auth_request_set $auth_resp_jwt $upstream_http_x_vouch_jwt; - # auth_request_set $auth_resp_err $upstream_http_x_vouch_err; - # auth_request_set $auth_resp_failcount $upstream_http_x_vouch_failcount; - - # proxy_set_header X-Real-IP $remote_addr; - # proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - # proxy_set_header X-Forwarded-Proto $scheme; - # proxy_set_header X-Forwarded-Host $http_host; } - - # location / { - # return 301 https://google.com; - # } - - # location /auth { - # return 302 https://google.com; - # } - - # location / { - # # forward the /validate request to Vouch Proxy - # proxy_pass http://vouch:9090/validate; - - # # # be sure to pass the original host header - # # proxy_set_header Host $http_host; - # # # Vouch Proxy only acts on the request headers - # # proxy_pass_request_body off; - # # proxy_set_header Content-Length ""; - # # # optionally add X-Vouch-User as returned by Vouch Proxy along with the request - # # auth_request_set $auth_resp_x_vouch_user $upstream_http_x_vouch_user; - # # # these return values are used by the @error401 call - # # auth_request_set $auth_resp_jwt $upstream_http_x_vouch_jwt; - # # auth_request_set $auth_resp_err $upstream_http_x_vouch_err; - # # auth_request_set $auth_resp_failcount $upstream_http_x_vouch_failcount; - # } - # location = /validate { - # # forward the /validate request to Vouch Proxy - # proxy_pass http://vouch:9090/validate; - # # be sure to pass the original host header - # proxy_set_header Host $http_host; - # # Vouch Proxy only acts on the request headers - # proxy_pass_request_body off; - # proxy_set_header Content-Length ""; - # # optionally add X-Vouch-User as returned by Vouch Proxy along with the request - # auth_request_set $auth_resp_x_vouch_user $upstream_http_x_vouch_user; - # # these return values are used by the @error401 call - # auth_request_set $auth_resp_jwt $upstream_http_x_vouch_jwt; - # auth_request_set $auth_resp_err $upstream_http_x_vouch_err; - # auth_request_set $auth_resp_failcount $upstream_http_x_vouch_failcount; - # } - - # # if validate returns `401 not authorized` then forward the request to the error401block - # error_page 401 = @error401; - - # location @error401 { - # # redirect to Vouch Proxy for login - # return 302 https://vouch.armos.zinomedia.de/login?url=$scheme://$http_host$request_uri&vouch-failcount=$auth_resp_failcount&X-Vouch-Token=$auth_resp_jwt&error=$auth_resp_err; - # } } server { diff --git a/volumes/snippets/enable-vouch.conf b/volumes/snippets/enable-vouch.conf index 7eddb90..4673313 100644 --- a/volumes/snippets/enable-vouch.conf +++ b/volumes/snippets/enable-vouch.conf @@ -5,7 +5,6 @@ location = /validate { internal; proxy_pass "https://validate.vouch.armos.zinomedia.de/validate"; - # proxy_set_header X-Forwarded-Host $http_host; # Vouch Proxy only acts on the request headers proxy_pass_request_body off; proxy_set_header Content-Length "";