From 6ee75bfc4e30dce3ea175614f711cd762130c31f Mon Sep 17 00:00:00 2001
From: Jesper Hess Nielsen <jesper@graffen.dk>
Date: Sun, 24 Jun 2018 15:16:29 +0200
Subject: [PATCH 1/4] Update .gitignore to ignore vagrant stuff

---
 .gitignore | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitignore b/.gitignore
index a3d8610..9e0226e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
 playbook.retry
 *.sw*
+.vagrant/
+*.log

From b7fb9dc360234511057faf7a426b4efcfd82e3da Mon Sep 17 00:00:00 2001
From: Jesper Hess Nielsen <jesper@graffen.dk>
Date: Sun, 24 Jun 2018 15:16:56 +0200
Subject: [PATCH 2/4] Configure external_services network

---
 roles/docker/tasks/services.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/roles/docker/tasks/services.yml b/roles/docker/tasks/services.yml
index 0af5bd9..41f7f7d 100644
--- a/roles/docker/tasks/services.yml
+++ b/roles/docker/tasks/services.yml
@@ -1,3 +1,7 @@
+- name: setup external services network
+  docker_network:
+    name: external_services
+        
 - name: setup gitea
   docker_service:
     project_name: gitea

From d5d1e3e8cc2006be0f6d15aa8fdc6bc981708aee Mon Sep 17 00:00:00 2001
From: Jesper Hess Nielsen <jesper@graffen.dk>
Date: Sun, 24 Jun 2018 15:17:35 +0200
Subject: [PATCH 3/4] Add nginx reverse proxy docker config

---
 roles/docker/files/composefiles/nginx-proxy.yml | 16 ++++++++++++++++
 roles/docker/tasks/services.yml                 |  6 ++++++
 2 files changed, 22 insertions(+)
 create mode 100644 roles/docker/files/composefiles/nginx-proxy.yml

diff --git a/roles/docker/files/composefiles/nginx-proxy.yml b/roles/docker/files/composefiles/nginx-proxy.yml
new file mode 100644
index 0000000..b835515
--- /dev/null
+++ b/roles/docker/files/composefiles/nginx-proxy.yml
@@ -0,0 +1,16 @@
+---
+version: '3'
+
+services:
+  nginx-proxy:
+    image: jwilder/nginx-proxy
+    ports:
+      - "80:80"
+    volumes:
+      - /var/run/docker.sock:/tmp/docker.sock:ro
+    networks:
+      - external_services
+    container_name: nginx-proxy
+networks:
+  external_services: 
+    external: true
diff --git a/roles/docker/tasks/services.yml b/roles/docker/tasks/services.yml
index 41f7f7d..3ceafcf 100644
--- a/roles/docker/tasks/services.yml
+++ b/roles/docker/tasks/services.yml
@@ -1,6 +1,12 @@
 - name: setup external services network
   docker_network:
     name: external_services
+
+- name: setup nginx reverse proxy
+  docker_service:
+    project_name: nginx-proxy
+    definition:
+        "{{ lookup('file', 'composefiles/nginx-proxy.yml') | from_yaml }}"
         
 - name: setup gitea
   docker_service:

From a995b6d5518d9530d9eb39eaf09d69a54b25055d Mon Sep 17 00:00:00 2001
From: Jesper Hess Nielsen <jesper@graffen.dk>
Date: Sun, 24 Jun 2018 15:17:57 +0200
Subject: [PATCH 4/4] Configure services to use nginx-proxy and
 external_services network

---
 roles/docker/files/composefiles/gitea.yml     |  6 +++++-
 roles/docker/files/composefiles/nextcloud.yml | 20 ++++++++++++++-----
 2 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/roles/docker/files/composefiles/gitea.yml b/roles/docker/files/composefiles/gitea.yml
index 09081f3..1cec5dd 100644
--- a/roles/docker/files/composefiles/gitea.yml
+++ b/roles/docker/files/composefiles/gitea.yml
@@ -2,7 +2,8 @@ version: "2.3"
 
 networks:
   gitea:
-    external: false
+  external_services:
+    external: true
 
 services:
   server:
@@ -10,9 +11,12 @@ services:
     environment:
       - USER_UID=1000
       - USER_GID=1000
+      - VIRTUAL_HOST=gitea.local
+      - VIRTUAL_PORT=3000
     restart: always
     networks:
       - gitea
+      - external_services
     volumes:
       - gitea:/data
     ports:
diff --git a/roles/docker/files/composefiles/nextcloud.yml b/roles/docker/files/composefiles/nextcloud.yml
index c37a449..6b21147 100644
--- a/roles/docker/files/composefiles/nextcloud.yml
+++ b/roles/docker/files/composefiles/nextcloud.yml
@@ -8,11 +8,10 @@ services:
     environment:
       - POSTGRES_DB=nextcloud
       - POSTGRES_USER=nextcloud
-
+    networks:
+      - nextcloud
   app:
     image: nextcloud
-    ports:
-      - 8080:80
     volumes:
       - nextcloud:/var/www/html
     restart: always
@@ -21,8 +20,19 @@ services:
       - POSTGRES_PASSWORD=hest
       - POSTGRES_DB=nextcloud
       - POSTGRES_USER=nextcloud
-    depends_on: 
+      - VIRTUAL_HOST=nextcloud.local
+    depends_on:
       - db
+    ports:
+      - "80"
+    networks:
+      - nextcloud
+      - external_services
 volumes:
   nextcloud:
-  db:
\ No newline at end of file
+  db:
+
+networks:
+  external_services:
+    external: true
+  nextcloud:
\ No newline at end of file