From cf4a85dcc6bfcce412f8829cab06003236a96c9f Mon Sep 17 00:00:00 2001
From: gsd <mamu@ebal.net>
Date: Wed, 12 Mar 2025 19:42:14 +0300
Subject: [PATCH] echo fix

---
 docker-compose.yaml |  5 +----
 entrypoint.sh       | 14 ++++++++------
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/docker-compose.yaml b/docker-compose.yaml
index 166c82a..0a7c2cf 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -1,7 +1,7 @@
 #curl -s http://localhost:9100/metrics | curl --data-binary @- http://pushgateway.example.org:9091/metrics/job/some_job/instance/some_instance
 services:
   pushgateway:
-    image: docker.pblr-nyk.pro/prom/pushgateway:latest
+    image: prom/pushgateway:latest
     container_name: p_gw
     restart: unless-stopped
     deploy:
@@ -17,9 +17,6 @@ services:
     #GATEWAY | first gateway without pass words
     env_file:
       - .env
-    #volumes:
-    #  - $PWD/srv.conf:/etc/nginx/conf.d/srv.conf:ro
-    #  - $PWD/.htpasswd:/etc/nginx/.htpasswd:ro
     ports:
       - 9100:9100
     deploy:
diff --git a/entrypoint.sh b/entrypoint.sh
index 8c28142..87e37d2 100644
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -3,11 +3,11 @@
 #htpasswd part
 rm /etc/nginx/.htpasswd || echo "cleared"
 touch /etc/nginx/.htpasswd
-USERS_SPLIT=$(echo -n $COMBO | tr ";" "\n")
+USERS_SPLIT=$(echo -n \"$COMBO\" | tr ";" "\n")
 for USER in $USERS_SPLIT
 do
-    USERNAME=$(echo -n $USER | cut -d ":" -f 1)
-    PASSWORD=$(echo -n $USER | cut -d ":" -f 2)
+    USERNAME=$(echo -n \"$USER\" | cut -d ":" -f 1)
+    PASSWORD=$(echo -n \"$USER\" | cut -d ":" -f 2)
     htpasswd -b /etc/nginx/.htpasswd $USERNAME $PASSWORD
 done
 
@@ -15,14 +15,14 @@ done
 #gateway_0 is main
 rm /etc/nginx/conf.d/srv.conf || echo "cleared"
 touch /etc/nginx/conf.d/srv.conf
-GATEWAYS_SPLIT=$(echo -n $GATEWAY | tr ";" "\n")
+GATEWAYS_SPLIT=$(echo -n \"$GATEWAY\" | tr ";" "\n")
 
 COUNTER=0
 for GATEWAY in $GATEWAYS_SPLIT
 do
 cat <<EOT >> /etc/nginx/conf.d/srv.conf
 upstream gateway_$COUNTER {
-    server $(echo -n $GATEWAY | cut -d "|" -f 1);
+    server $(echo -n \"$GATEWAY\" | cut -d "|" -f 1);
 }
 
 EOT
@@ -39,6 +39,8 @@ server {
     client_max_body_size        10M;
 
     location / {
+        auth_basic "Pushgateway server authentication";
+        auth_basic_user_file /etc/nginx/.htpasswd;
         proxy_pass http://gateway_0;
     }
 
@@ -88,7 +90,7 @@ if [ $COUNTER -gt 0 ]; then
         rewrite /.* \$request_uri break;
         proxy_pass http://gateway_$COUNTER;
         proxy_set_header X-Is-Mirror 'yes';
-        proxy_set_header Authorization "Basic $(echo -n $GATEWAY | cut -d "|" -f 2 | base64)";
+        proxy_set_header Authorization "Basic $(echo -n \"$GATEWAY\" | cut -d "|" -f 2 | base64)";
 
         limit_except POST {
             deny all;