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

playbook.yml

@@ -2,6 +2,12 @@
 - hosts: all
   gather_facts: False
   become: true
+  vars:
+    # Services are the names of the compose files in docker/files/composefiles
+    services:
+      - nginx-proxy
+      - gitea
+      - nextcloud
 
   roles:
     - ubuntu_base

roles/docker/tasks/services.yml

@@ -2,20 +2,9 @@
   docker_network:
     name: external_services
 
-- name: setup nginx reverse proxy
+- name: setup services
   docker_service:
-    project_name: nginx-proxy
+    project_name: "{{ item }}"
     definition:
-        "{{ lookup('file', 'composefiles/nginx-proxy.yml') | from_yaml }}"
+        "{{ lookup('file', 'composefiles/{{ item }}.yml') | from_yaml }}"
-        
+  with_items: "{{ services }}"
-- name: setup gitea
-  docker_service:
-    project_name: gitea
-    definition:
-        "{{ lookup('file', 'composefiles/gitea.yml') | from_yaml }}"
-
-- name: setup nextcloud
-  docker_service:
-    project_name: nextcloud
-    definition:
-        "{{ lookup('file', 'composefiles/nextcloud.yml') | from_yaml }}"