Merge pull request #2 from Gontier-Julien/restart-the-main-frame

Just aesthetic and more logical placement for restart.

docker-compose-tunnels.yml

@@ -3,12 +3,12 @@ services:
   nginx:
     image: nginx:mainline-alpine
     container_name: nginx
-    restart: ${RESTART:-unless-stopped}
     hostname: ${DOMAIN_NAME:?err}
     volumes:
       - './http-root:/var/lib/nginx/html/http-root:ro'
       - './preset/nginx.conf:/etc/nginx/nginx.conf:ro'
       - './preset/conf.d-tunnels:/etc/nginx/conf.d:ro'
+    restart: ${RESTART:-unless-stopped}
 
   syncthing:
     image: syncthing/syncthing:latest
@@ -31,8 +31,8 @@ services:
     image: erisamoe/cloudflared:latest
     container_name: cloudflared
     command: --origincert /root/.cloudflared/cert.pem tunnel run --url http://nginx ${DOMAIN_NAME:?err}
-    restart: ${RESTART:-unless-stopped}
     volumes:
       - './data/cloudflared/etc:/etc/cloudflared'
       - './data/cloudflared/home:/root'
       - './preset/passwd:/etc/passwd'
+    restart: ${RESTART:-unless-stopped}

docker-compose.yml

@@ -3,7 +3,6 @@ services:
   nginx:
     image: nginx:mainline-alpine
     container_name: nginx
-    restart: ${RESTART:-unless-stopped}
     hostname: ${DOMAIN_NAME:?err}
     volumes:
       - './http-root:/var/lib/nginx/html/http-root:ro'
@@ -18,6 +17,7 @@ services:
     ports:
       - '80:80'
       - '443:443'
+    restart: ${RESTART:-unless-stopped}
 
   syncthing:
     image: syncthing/syncthing:latest
@@ -39,9 +39,9 @@ services:
   certbot:
     image: certbot/certbot:${LETSENCRYPT_TAG:-latest}
     container_name: certbot
-    restart: ${RESTART:-unless-stopped}
     volumes:
       - './data/acme-webroot:/srv/http/webroot'
       - './data/letsencrypt/etc:/etc/letsencrypt'
       - './data/letsencrypt/var:/var/lib/letsencrypt'
     entrypoint: "/bin/sh -c 'trap exit TERM; sleep 10; while :; do certbot renew -w /srv/http/webroot/ --webroot; sleep 12h & wait $${!}; done;'"
+    restart: ${RESTART:-unless-stopped}