fixed svc-hostname script error with curl and grep

.gitignore

@@ -1 +1,3 @@
 .env
+*.tar.gz
+config/

docker-compose.yml

@@ -14,9 +14,10 @@ services:
       - tor_net
     depends_on:
       - broker
+    restart: unless-stopped
 
   broker:
-    image: eclipse-mosquitto
+    image: eclipse-mosquitto:1.6
     volumes:
       - broker_data:/mosquitto/data
       - ${CONFIG_DIR}:/mosquitto/config:ro
@@ -26,6 +27,7 @@ services:
     networks:
       - tor_net
       - broker_net
+    restart: unless-stopped
 
   subscriber:
     build: './subscriber'
@@ -38,6 +40,7 @@ services:
       - broker_net
     depends_on:
       - broker
+    restart: unless-stopped
 
 volumes:
   broker_data:

scripts/backup.sh

@@ -2,15 +2,17 @@
 
 [ $# -lt 2 ] && { echo "Usage: $0 {backup|restore} BACKUP_FILENAME"; exit 1; }
 
+DOCKER_COMPOSE=/usr/bin/docker-compose
+
 backup_file=$2
 
 project_subscriber_volume_name=client_data
 project_tor_volume_name=tor_config
 tor_service=tor
 
-docker-compose --log-level WARNING up --no-start
+$DOCKER_COMPOSE --log-level WARNING up --no-start
 
-project_name=$(docker ps -a --no-trunc | grep $(docker-compose ps -q ${tor_service}) | awk '{ print $2; }' | awk -F "_" '{ print $1; }')
+project_name=$(docker ps -a --no-trunc | grep $($DOCKER_COMPOSE ps -q ${tor_service}) | awk '{ print $2; }' | awk -F "_" '{ print $1; }')
 
 project_volumes=$(docker volume ls -f name=$project_name | awk '{if (NR > 1) print $2"\n";}')
 
@@ -34,7 +36,9 @@ function backup {
 
 function restore {
 
-  docker-compose stop $tor_service
+  $DOCKER_COMPOSE stop $tor_service
+
+  cp $backup_file backup.tar.gz
 
   docker run --rm \
     -v $subscriber_volume:/data/subscriber \
@@ -43,7 +47,9 @@ function restore {
     ubuntu \
     tar -C / -xzvf /backup/backup.tar.gz
 
-  docker-compose start $tor_service
+  $DOCKER_COMPOSE start $tor_service
+
+  rm backup.tar.gz
 }
 
 $1

tor/svc-hostname

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-while ! curl -s --socks5 127.0.0.1:9050 'https://check.torproject.org/' | grep -qm1 Congratulations
+while ! curl -s -N --socks5 127.0.0.1:9050 'https://check.torproject.org/' | grep -qm1 Congratulations
 do
   sleep 0.5
 done