From 615ef294ba5113fc03d6c2c77d33335d87c0e977 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=AD=C3=B0ir=20Valberg=20Gu=C3=B0mundsson?=
 <valberg@orn.li>
Date: Sun, 24 Jun 2018 18:19:56 +0200
Subject: [PATCH] We can generalise the way we setup services and "just" define
 the names of the services.

---
 playbook.yml                    |  6 ++++++
 roles/docker/tasks/services.yml | 19 ++++---------------
 2 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/playbook.yml b/playbook.yml
index 76d0871..91fbb76 100644
--- a/playbook.yml
+++ b/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
diff --git a/roles/docker/tasks/services.yml b/roles/docker/tasks/services.yml
index 3ceafcf..b4334b6 100644
--- a/roles/docker/tasks/services.yml
+++ b/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 }}"
-        
-- 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 }}"
+        "{{ lookup('file', 'composefiles/{{ item }}.yml') | from_yaml }}"
+  with_items: "{{ services }}"