fix apache HTTP2HTTPS redirect config

[ansible.git] / site.yml

diff --git a/site.yml b/site.yml
index 3c5fe4e43edb60144639bc72bb25bc0497386e88..d503df387bc67c2d98a51316b364ddb5036a1622 100644 (file)
--- a/site.yml
+++ b/site.yml
@@ -1,3 +1,13 @@
+# Dependencies are "expressed" by the hosts file, e.g.
+# ```
+# [email:children]
+# journalwatch
+# [letsencrypt:children]
+# prosody
+# ```
+# I tried using role dependencies but that doesn't interact well with tags:
+# When restricting to a tag, its dependencies still get played.
+

 - hosts: all
   gather_facts: no
   pre_tasks:
 - hosts: all
   gather_facts: no
   pre_tasks:


@@ -6,14 +16,30 @@
   - base
   tags: base
 
   - base
   tags: base
 

+- hosts: unbound
+  gather_facts: no
+  roles:
+  - unbound
+  tags: unbound
+

 - hosts: letsencrypt
   gather_facts: no
   roles:
   - letsencrypt
   tags: letsencrypt
 
 - hosts: letsencrypt
   gather_facts: no
   roles:
   - letsencrypt
   tags: letsencrypt
 

-# FIXME make this a role, or several
-- import_playbook: email.yml
+- hosts: email
+  gather_facts: no
+  roles:
+  - email
+  tags: email
+
+- hosts: journalwatch
+  # depends: email
+  gather_facts: no
+  roles:
+  - journalwatch
+  tags: journalwatch

 
 - hosts: bind
   gather_facts: no
 
 - hosts: bind
   gather_facts: no


@@ -28,7 +54,10 @@
   tags: etherpad
 
 - hosts: prosody
   tags: etherpad
 
 - hosts: prosody

+  # depends: letsencrypt

   gather_facts: no
   gather_facts: no

+  pre_tasks:
+  - setup:

   roles:
   - prosody
   tags: prosody
   roles:
   - prosody
   tags: prosody