From f5b7d0f14d82c7efbfe0b7fccdf14e7257285b81 Mon Sep 17 00:00:00 2001
From: Zolfa <zolfa@lilik.it>
Date: Tue, 28 Apr 2020 21:57:45 +0200
Subject: [PATCH] updated playbooks

---
 matrix.yaml    | 40 +++++++++++++++++++++++++---------------
 nextcloud.yaml |  1 -
 projects.yaml  |  7 +++----
 3 files changed, 28 insertions(+), 20 deletions(-)

diff --git a/matrix.yaml b/matrix.yaml
index e0ce72b..e687c51 100644
--- a/matrix.yaml
+++ b/matrix.yaml
@@ -1,18 +1,28 @@
 ---
-- hosts: biff
+- hosts: 'matrix'
+  gather_facts: false
+  tags:
+    - 'lxc'
+  tasks:
+    - import_role: name='lxc_guest'
+      vars:
+        vm_name: '{{ inventory_hostname }}'
+        vm_size: '2G'
+        vg_name: '{{ hostvars[ansible_lxc_host]["vg_name"] }}'
+      delegate_to: '{{ ansible_lxc_host }}'
+    - set_fact: ansible_connection='ssh_lxc'
+    - setup:
+    - import_role: name='ssh_server'
+    - set_fact: ansible_connection='ssh'
+
+- hosts: 'matrix'
   roles:
-    - role: lxc_guest
-      vm_name: matrix
-      distro: sid
-    - role: ssh_server
-      ansible_connection: ssh_lxc
-      ansible_ssh_lxc_name: matrix
-- hosts: matrix
+    - role: 'dns_record'
+    - role: 'reverse_proxy'
+    - role: 'coturn'
+    - role: 'matrix-synapse'
+#    - role: 'riot-web'
+
+- hosts: 'status'
   roles:
-    - role: dns_record
-    - role: reverse_proxy
-    - role: matrix-synapse
-    - role: riot-web
-- hosts: status
-  roles:
-    - role: icinga2-monitoring
+    - role: 'icinga2-monitoring'
diff --git a/nextcloud.yaml b/nextcloud.yaml
index d3ffa99..544a176 100644
--- a/nextcloud.yaml
+++ b/nextcloud.yaml
@@ -17,7 +17,6 @@
   roles:
     - role: 'dns_record'
     - role: 'reverse_proxy'
-      hostname: 'cloud'
     - role: 'nextcloud'
 
 - hosts: 'status'
diff --git a/projects.yaml b/projects.yaml
index 95fb1a1..0901cd6 100644
--- a/projects.yaml
+++ b/projects.yaml
@@ -19,11 +19,10 @@
   roles:
     - role: 'dns_record'
     - role: 'reverse_proxy'
-      hostname: 'projects'
-    - role: 'reverse_proxy'
-      hostname: 'mattermost'
+      server_fqdns:
+        - 'projects.{{ domain }}'
+        - 'mattermost.{{ domain }}'
     - role: 'gitlab'
-      mattermost_hostname: 'mattermost'
 
 - hosts: 'status'
   roles: