From d3d1f18278d8503b1c9ef3f84a16df070a9351de Mon Sep 17 00:00:00 2001
From: "nicolas.dorier" <nicolas.dorier@gmail.com>
Date: Mon, 10 Jun 2019 12:27:08 +0900
Subject: [PATCH] move nginx-gen into nginx.yml

---
 .../docker-fragments/nginx-https.yml             | 16 ----------------
 .../docker-fragments/nginx.yml                   | 15 +++++++++++++++
 2 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/docker-compose-generator/docker-fragments/nginx-https.yml b/docker-compose-generator/docker-fragments/nginx-https.yml
index a9e71dc..9295fc8 100644
--- a/docker-compose-generator/docker-fragments/nginx-https.yml
+++ b/docker-compose-generator/docker-fragments/nginx-https.yml
@@ -1,22 +1,6 @@
 version: "3"
 
 services:
-  nginx-gen:
-    restart: unless-stopped
-    image: btcpayserver/docker-gen:0.7.5
-    container_name: nginx-gen
-    volumes:
-      - "/var/run/docker.sock:/tmp/docker.sock:ro"
-      - "./nginx.tmpl:/etc/docker-gen/templates/nginx.tmpl:ro"
-      - "nginx_conf:/etc/nginx/conf.d"
-      - "nginx_vhost:/etc/nginx/vhost.d"
-      - "nginx_html:/usr/share/nginx/html"
-      - "nginx_certs:/etc/nginx/certs:ro"
-    entrypoint: /usr/local/bin/docker-gen -notify-sighup nginx -watch -wait 5s:30s /etc/docker-gen/templates/nginx.tmpl /etc/nginx/conf.d/default.conf
-    links:
-      - btcpayserver
-      - nginx
-
   letsencrypt-nginx-proxy-companion:
     restart: unless-stopped
     image: btcpayserver/letsencrypt-nginx-proxy-companion:1.10.0
diff --git a/docker-compose-generator/docker-fragments/nginx.yml b/docker-compose-generator/docker-fragments/nginx.yml
index 74f0439..35e87fd 100644
--- a/docker-compose-generator/docker-fragments/nginx.yml
+++ b/docker-compose-generator/docker-fragments/nginx.yml
@@ -13,6 +13,21 @@ services:
       - "nginx_vhost:/etc/nginx/vhost.d"
       - "nginx_html:/usr/share/nginx/html"
       - "nginx_certs:/etc/nginx/certs:ro"
+  nginx-gen:
+    restart: unless-stopped
+    image: btcpayserver/docker-gen:0.7.5
+    container_name: nginx-gen
+    volumes:
+      - "/var/run/docker.sock:/tmp/docker.sock:ro"
+      - "./nginx.tmpl:/etc/docker-gen/templates/nginx.tmpl:ro"
+      - "nginx_conf:/etc/nginx/conf.d"
+      - "nginx_vhost:/etc/nginx/vhost.d"
+      - "nginx_html:/usr/share/nginx/html"
+      - "nginx_certs:/etc/nginx/certs:ro"
+    entrypoint: /usr/local/bin/docker-gen -notify-sighup nginx -watch -wait 5s:30s /etc/docker-gen/templates/nginx.tmpl /etc/nginx/conf.d/default.conf
+    links:
+      - btcpayserver
+      - nginx
 volumes:
     nginx_conf:
     nginx_vhost: