Use task-based vars loading to allow sensible data deployment skips, fix indents

2020-05-14 14:18:44 +02:00 · 2020-05-14 14:18:44 +02:00 · e7fc142dc8
commit e7fc142dc8
parent c074c944ab
16 changed files with 13 additions and 26 deletions
--- a/ansible.cfg
+++ b/ansible.cfg
@ -0,0 +1,5 @@
+[defaults]
+gathering = smart
+fact_caching = jsonfile
+fact_caching_connection = ~/.ansible-fax
+fact_caching_timeout = 86400
--- a/common.yml
+++ b/common.yml
@ -1,4 +1,4 @@
 ---
 - hosts: all
  roles:
-          - common
+        - common
--- a/database.yml
+++ b/database.yml
@ -1,6 +1,4 @@
 ---
 - hosts: database
-  vars_files:
-        - '{{ role_path }}/vault/main.yml'
  roles:
        - database
--- a/dns.yml
+++ b/dns.yml
@ -1,4 +1,4 @@
 ---
 - hosts: dns
  roles:
-          - dns
+        - dns
--- a/git.yml
+++ b/git.yml
@ -1,7 +1,4 @@
 ---
 - hosts: git
-  vars_files:
-        - '{{ role_path }}/vars/database.yml'
-        - '{{ role_path }}/vault/keys.yml'
  roles:
        - git
--- a/ircd.yml
+++ b/ircd.yml
@ -1,4 +1,4 @@
 ---
 - hosts: ircd
  roles:
-          - ircd
+        - ircd
--- a/monitoring.yml
+++ b/monitoring.yml
@ -1,7 +1,4 @@
 ---
 - hosts: monitoring
-  vars_files:
-        - '{{ role_path }}/vars/database.yml'
-        - '{{ role_path }}/vault/keys.yml'
  roles:
        - monitoring
--- a/mumble.yml
+++ b/mumble.yml
@ -1,7 +1,4 @@
 ---
 - hosts: mumble
-  vars_files:
-        - '{{ role_path }}/vars/database.yml'
-        - '{{ role_path }}/vault/keys.yml'
  roles:
        - mumble
--- a/pleroma.yml
+++ b/pleroma.yml
@ -1,7 +1,4 @@
 ---
 - hosts: pleroma
-  vars_files:
-        - '{{ role_path }}/vars/database.yml'
-        - '{{ role_path }}/vault/keys.yml'
  roles:
        - pleroma
--- a/roles/database
+++ b/roles/database
@ -1 +1 @@
-Subproject commit 38763fda084a6680ed1aece6bfd596b27d57b580
+Subproject commit c724c33058fa856ad39a5c547147bad8f69328ae
--- a/roles/git
+++ b/roles/git
@ -1 +1 @@
-Subproject commit 3546d51d3174f55219b70a42581840fa8e9f2820
+Subproject commit 8138afd23714239c283d7ec7dbe3d1932084125a
--- a/roles/mumble
+++ b/roles/mumble
@ -1 +1 @@
-Subproject commit 0548bb0340bdb13fcf94da8e603faae09da8b84b
+Subproject commit fb85a1d3fc0d0e3fb321620da1b599cca48aa344
--- a/roles/seedbox
+++ b/roles/seedbox
@ -1 +1 @@
-Subproject commit b89f03791ad0961832f4df486a3b97b51fbf1ab9
+Subproject commit cb39925ad6cb4d5d85e8b175766a9e6b3142a073
--- a/roles/wireguard
+++ b/roles/wireguard
@ -1 +1 @@
-Subproject commit 9f2cd5737e78287e6e5477f4b551feb7bc4134e3
+Subproject commit 01d272f0522d01f681c0180ffa0a80322a91d302
--- a/seedbox.yml
+++ b/seedbox.yml
@ -1,6 +1,4 @@
 ---
 - hosts: seedbox
-  vars_files:
-        - '{{ role_path }}/vault/creds.yml'
  roles:
        - seedbox
--- a/wireguard.yml
+++ b/wireguard.yml
@ -1,6 +1,4 @@
 ---
 - hosts: wireguard
-  vars_files:
-        - '{{ role_path }}/vault/keys.yml'
  roles:
        - wireguard