From d4f9da104de2bd0c53558405149f548bd4b91ab4 Mon Sep 17 00:00:00 2001
From: Scott Wallace <scott@wallace.sh>
Date: Sat, 25 May 2019 12:42:20 +0100
Subject: [PATCH] Re-jig Linux server stuff

---
 .ansible/inventory.yaml                                      | 2 +-
 .../{home_server => common_server}/handlers/firewalld.yaml   | 0
 .../roles/{home_server => common_server}/handlers/main.yaml  | 0
 .../roles/{home_server => common_server}/handlers/sensu.yaml | 0
 .../roles/{home_server => common_server}/tasks/basics.yaml   | 0
 .../roles/{home_server => common_server}/tasks/main.yaml     | 2 +-
 .../roles/{home_server => common_server}/tasks/sensu.yaml    | 0
 .../{home_server => common_server}/tasks/sensu_checks.yaml   | 0
 .ansible/roles/{home_server => common_server}/vars/main.yaml | 2 +-
 .ansible/roles/linux_desktop/tasks/config.yaml               | 2 +-
 .ansible/site.yaml                                           | 5 ++++-
 11 files changed, 8 insertions(+), 5 deletions(-)
 rename .ansible/roles/{home_server => common_server}/handlers/firewalld.yaml (100%)
 rename .ansible/roles/{home_server => common_server}/handlers/main.yaml (100%)
 rename .ansible/roles/{home_server => common_server}/handlers/sensu.yaml (100%)
 rename .ansible/roles/{home_server => common_server}/tasks/basics.yaml (100%)
 rename .ansible/roles/{home_server => common_server}/tasks/main.yaml (65%)
 rename .ansible/roles/{home_server => common_server}/tasks/sensu.yaml (100%)
 rename .ansible/roles/{home_server => common_server}/tasks/sensu_checks.yaml (100%)
 rename .ansible/roles/{home_server => common_server}/vars/main.yaml (83%)

diff --git a/.ansible/inventory.yaml b/.ansible/inventory.yaml
index 4e43693..903b882 100644
--- a/.ansible/inventory.yaml
+++ b/.ansible/inventory.yaml
@@ -5,4 +5,4 @@ desktop:
 
 home_servers:
   hosts:
-    homer
+    sol
diff --git a/.ansible/roles/home_server/handlers/firewalld.yaml b/.ansible/roles/common_server/handlers/firewalld.yaml
similarity index 100%
rename from .ansible/roles/home_server/handlers/firewalld.yaml
rename to .ansible/roles/common_server/handlers/firewalld.yaml
diff --git a/.ansible/roles/home_server/handlers/main.yaml b/.ansible/roles/common_server/handlers/main.yaml
similarity index 100%
rename from .ansible/roles/home_server/handlers/main.yaml
rename to .ansible/roles/common_server/handlers/main.yaml
diff --git a/.ansible/roles/home_server/handlers/sensu.yaml b/.ansible/roles/common_server/handlers/sensu.yaml
similarity index 100%
rename from .ansible/roles/home_server/handlers/sensu.yaml
rename to .ansible/roles/common_server/handlers/sensu.yaml
diff --git a/.ansible/roles/home_server/tasks/basics.yaml b/.ansible/roles/common_server/tasks/basics.yaml
similarity index 100%
rename from .ansible/roles/home_server/tasks/basics.yaml
rename to .ansible/roles/common_server/tasks/basics.yaml
diff --git a/.ansible/roles/home_server/tasks/main.yaml b/.ansible/roles/common_server/tasks/main.yaml
similarity index 65%
rename from .ansible/roles/home_server/tasks/main.yaml
rename to .ansible/roles/common_server/tasks/main.yaml
index 01f2020..917f252 100644
--- a/.ansible/roles/home_server/tasks/main.yaml
+++ b/.ansible/roles/common_server/tasks/main.yaml
@@ -1,3 +1,3 @@
 - name: Home server tasks
   import_tasks: basics.yaml
-- import_tasks: sensu.yaml
+# - import_tasks: sensu.yaml
diff --git a/.ansible/roles/home_server/tasks/sensu.yaml b/.ansible/roles/common_server/tasks/sensu.yaml
similarity index 100%
rename from .ansible/roles/home_server/tasks/sensu.yaml
rename to .ansible/roles/common_server/tasks/sensu.yaml
diff --git a/.ansible/roles/home_server/tasks/sensu_checks.yaml b/.ansible/roles/common_server/tasks/sensu_checks.yaml
similarity index 100%
rename from .ansible/roles/home_server/tasks/sensu_checks.yaml
rename to .ansible/roles/common_server/tasks/sensu_checks.yaml
diff --git a/.ansible/roles/home_server/vars/main.yaml b/.ansible/roles/common_server/vars/main.yaml
similarity index 83%
rename from .ansible/roles/home_server/vars/main.yaml
rename to .ansible/roles/common_server/vars/main.yaml
index ce88af9..781b566 100644
--- a/.ansible/roles/home_server/vars/main.yaml
+++ b/.ansible/roles/common_server/vars/main.yaml
@@ -1,6 +1,6 @@
 server_packages:
-  - epel-release
   - git
+  - haproxy
   - lsof
   - net-tools
   - psmisc
diff --git a/.ansible/roles/linux_desktop/tasks/config.yaml b/.ansible/roles/linux_desktop/tasks/config.yaml
index beeec4f..22d6913 100644
--- a/.ansible/roles/linux_desktop/tasks/config.yaml
+++ b/.ansible/roles/linux_desktop/tasks/config.yaml
@@ -8,7 +8,7 @@
         path: '/etc/systemd/resolved.conf'
         state: present
         regexp: 'DNSSEC='
-        line: 'DNSSEC=yes'
+        line: '#DNSSEC=allow-downgrade'
       become: true
 
     - name: 'DNS: Restart resolver'
diff --git a/.ansible/site.yaml b/.ansible/site.yaml
index 9bece12..b31bfe3 100644
--- a/.ansible/site.yaml
+++ b/.ansible/site.yaml
@@ -1,4 +1,7 @@
 - name: Home server
   hosts: home_servers
   roles:
-    - home_server
+    - common_server
+    - searx_server
+    - matrix_server
+    - media_server