From 341a8e64f5cb932a961e49e6ef56f371efb53984 Mon Sep 17 00:00:00 2001
From: "nicolas.dorier" <nicolas.dorier@gmail.com>
Date: Mon, 10 Jun 2019 11:58:52 +0900
Subject: [PATCH] Put HTTPS in separate yml file

---
 .../docker-fragments/nginx-https.yml          | 35 +++++++++++++++++++
 .../docker-fragments/nginx.yml                | 34 ------------------
 2 files changed, 35 insertions(+), 34 deletions(-)
 create mode 100644 docker-compose-generator/docker-fragments/nginx-https.yml

diff --git a/docker-compose-generator/docker-fragments/nginx-https.yml b/docker-compose-generator/docker-fragments/nginx-https.yml
new file mode 100644
index 0000000..a9e71dc
--- /dev/null
+++ b/docker-compose-generator/docker-fragments/nginx-https.yml
@@ -0,0 +1,35 @@
+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
+    container_name: letsencrypt-nginx-proxy-companion
+    volumes:
+      - "/var/run/docker.sock:/var/run/docker.sock:ro"
+      - "nginx_conf:/etc/nginx/conf.d"
+      - "nginx_vhost:/etc/nginx/vhost.d"
+      - "nginx_html:/usr/share/nginx/html"
+      - "nginx_certs:/etc/nginx/certs:rw"
+    environment:
+      NGINX_DOCKER_GEN_CONTAINER: "nginx-gen"
+      NGINX_PROXY_CONTAINER: "nginx"
+      ACME_CA_URI: ${ACME_CA_URI:-https://acme-staging.api.letsencrypt.org/directory}
+    links:
+      - nginx-gen
diff --git a/docker-compose-generator/docker-fragments/nginx.yml b/docker-compose-generator/docker-fragments/nginx.yml
index a77e487..74f0439 100644
--- a/docker-compose-generator/docker-fragments/nginx.yml
+++ b/docker-compose-generator/docker-fragments/nginx.yml
@@ -13,40 +13,6 @@ 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
-
-  letsencrypt-nginx-proxy-companion:
-    restart: unless-stopped
-    image: btcpayserver/letsencrypt-nginx-proxy-companion:1.10.0
-    container_name: letsencrypt-nginx-proxy-companion
-    volumes:
-      - "/var/run/docker.sock:/var/run/docker.sock:ro"
-      - "nginx_conf:/etc/nginx/conf.d"
-      - "nginx_vhost:/etc/nginx/vhost.d"
-      - "nginx_html:/usr/share/nginx/html"
-      - "nginx_certs:/etc/nginx/certs:rw"
-    environment:
-      NGINX_DOCKER_GEN_CONTAINER: "nginx-gen"
-      NGINX_PROXY_CONTAINER: "nginx"
-      ACME_CA_URI: ${ACME_CA_URI:-https://acme-staging.api.letsencrypt.org/directory}
-    links:
-      - nginx-gen
-
 volumes:
     nginx_conf:
     nginx_vhost: