diff --git a/authelia.subdomain.conf.sample b/authelia.subdomain.conf.sample index fd06a73..0020b3b 100644 --- a/authelia.subdomain.conf.sample +++ b/authelia.subdomain.conf.sample @@ -1,4 +1,4 @@ -## Version 2023/02/12 +## Version 2023/04/14 # make sure that your authelia container is named authelia # make sure that your dns has a cname set for authelia # the default authelia-server and authelia-location confs included with swag rely on @@ -36,22 +36,4 @@ server { proxy_pass $upstream_proto://$upstream_app:$upstream_port; } - - location ~ (/authelia)?/metrics { - # enable the next two lines for http auth - #auth_basic "Restricted"; - #auth_basic_user_file /config/nginx/.htpasswd; - - # block metrics access by default because it is unprotected - # you can comment out the next line to enable remote metrics - deny all; - - include /config/nginx/proxy.conf; - include /config/nginx/resolver.conf; - set $upstream_app authelia; - set $upstream_port 9959; - set $upstream_proto http; - proxy_pass $upstream_proto://$upstream_app:$upstream_port; - - } } diff --git a/authentik.subdomain.conf.sample b/authentik.subdomain.conf.sample index 7b22778..d5c2faf 100644 --- a/authentik.subdomain.conf.sample +++ b/authentik.subdomain.conf.sample @@ -1,4 +1,4 @@ -## Version 2023/02/12 +## Version 2023/04/14 # make sure that your authentik container is named authentik-server # make sure that your dns has a cname set for authentik @@ -32,22 +32,4 @@ server { proxy_pass $upstream_proto://$upstream_app:$upstream_port; } - - location ~ (/authentik)?/metrics { - # enable the next two lines for http auth - #auth_basic "Restricted"; - #auth_basic_user_file /config/nginx/.htpasswd; - - # block metrics access by default because it is unprotected - # you can comment out the next line to enable remote metrics - deny all; - - include /config/nginx/proxy.conf; - include /config/nginx/resolver.conf; - set $upstream_app authentik-server; - set $upstream_port 9300; - set $upstream_proto http; - proxy_pass $upstream_proto://$upstream_app:$upstream_port; - - } } diff --git a/grafana.subdomain.conf.sample b/grafana.subdomain.conf.sample index 7e1a95e..a800440 100644 --- a/grafana.subdomain.conf.sample +++ b/grafana.subdomain.conf.sample @@ -1,4 +1,4 @@ -## Version 2023/02/12 +## Version 2023/04/14 # make sure that your grafana container is named grafana # make sure that your dns has a cname set for grafana @@ -56,22 +56,4 @@ server { proxy_pass $upstream_proto://$upstream_app:$upstream_port; } - - location ~ (/grafana)?/metrics { - # enable the next two lines for http auth - #auth_basic "Restricted"; - #auth_basic_user_file /config/nginx/.htpasswd; - - # block metrics access by default because it is unprotected - # you can comment out the next line to enable remote metrics - deny all; - - include /config/nginx/proxy.conf; - include /config/nginx/resolver.conf; - set $upstream_app grafana; - set $upstream_port 3000; - set $upstream_proto http; - proxy_pass $upstream_proto://$upstream_app:$upstream_port; - - } } diff --git a/grafana.subfolder.conf.sample b/grafana.subfolder.conf.sample index b6f9a36..8fe4bdf 100644 --- a/grafana.subfolder.conf.sample +++ b/grafana.subfolder.conf.sample @@ -1,4 +1,4 @@ -## Version 2023/02/12 +## Version 2023/04/14 # make sure that your grafana container is named grafana # make sure that grafana is set to work with the base url /grafana/ # grafana requires environment variables set thus: @@ -48,26 +48,3 @@ location ^~ /grafana/api { rewrite ^/grafana/(.*)$ /$1 break; } - -location ^~ /grafana/metrics { - # enable the next two lines for http auth - #auth_basic "Restricted"; - #auth_basic_user_file /config/nginx/.htpasswd; - - # block metrics access by default because it is unprotected - # you can comment out the next line to enable remote metrics - deny all; - - include /config/nginx/proxy.conf; - include /config/nginx/resolver.conf; - set $upstream_grafana grafana; - set $upstream_port 3000; - set $upstream_proto http; - proxy_pass http://$upstream_grafana:$upstream_port ; - - # Clear Authorization Header if you are using http auth and normal Grafana auth - #proxy_set_header Authorization ""; - - rewrite ^/grafana/(.*)$ /$1 break; - -} diff --git a/prometheus.subdomain.conf.sample b/prometheus.subdomain.conf.sample index b937208..52dc178 100644 --- a/prometheus.subdomain.conf.sample +++ b/prometheus.subdomain.conf.sample @@ -1,4 +1,4 @@ -## Version 2023/02/12 +## Version 2023/04/14 # make sure that your prometheus container is named prometheus # make sure that your dns has a cname set for prometheus @@ -67,22 +67,4 @@ server { proxy_pass $upstream_proto://$upstream_app:$upstream_port; } - - location ~ (/prometheus)?/metrics { - # enable the next two lines for http auth - #auth_basic "Restricted"; - #auth_basic_user_file /config/nginx/.htpasswd; - - # block metrics access by default because it is unprotected - # you can comment out the next line to enable remote metrics - deny all; - - include /config/nginx/proxy.conf; - include /config/nginx/resolver.conf; - set $upstream_app prometheus; - set $upstream_port 9090; - set $upstream_proto http; - proxy_pass $upstream_proto://$upstream_app:$upstream_port; - - } }