Merge branch 'reverseproxy' of data.coop/ansible into master

.gitignore

@@ -1,2 +1,4 @@
 playbook.retry
 *.sw*
+.vagrant/
+*.log

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:

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:
+  db:
+
+networks:
+  external_services:
+    external: true
+  nextcloud:

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

roles/docker/tasks/services.yml

@@ -1,3 +1,13 @@
+- 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:
     project_name: gitea