diff --git a/abra.sh b/abra.sh index dffa465..eae4567 100644 --- a/abra.sh +++ b/abra.sh @@ -1,4 +1,4 @@ export PROMTAIL_YML_VERSION=v2 export NODE_EXPORTER_ENTRYPOINT_VERSION=v1 -export NGINX_CONFIG_VERSION=v9 -export HTPASSWD_CONFIG_VERSION=v1 +export NGINX_CONFIG_VERSION=v11 +export HTPASSWD_CONFIG_VERSION=v2 diff --git a/compose.yml b/compose.yml index 2f230d0..4c6d29f 100644 --- a/compose.yml +++ b/compose.yml @@ -3,7 +3,7 @@ version: "3.8" services: app: - image: nginx:1.20.0 + image: nginx:1.20.0-alpine networks: - proxy - internal diff --git a/nginx.conf.tmpl b/nginx.conf.tmpl index 2416266..3a84feb 100644 --- a/nginx.conf.tmpl +++ b/nginx.conf.tmpl @@ -1,4 +1,4 @@ -user www-data; +#user www-data; events { worker_connections 768; @@ -13,14 +13,20 @@ http { resolver 127.0.0.11; location ~ ^/node_exporter(.*)$ { + auth_basic "admin"; + auth_basic_user_file /etc/nginx/conf.d/.htpasswd; proxy_pass http://{{ env "STACK_NAME" }}_node_exporter:9100$1; } location ~ ^/cadvisor(.*)$ { + auth_basic "admin"; + auth_basic_user_file /etc/nginx/conf.d/.htpasswd; proxy_pass http://{{ env "STACK_NAME" }}_cadvisor:8080$1; } location ~ ^/promtail(.*)$ { + auth_basic "admin"; + auth_basic_user_file /etc/nginx/conf.d/.htpasswd; proxy_pass http://{{ env "STACK_NAME" }}_promtail:9080$1; } }