Feat: Gather facts and use default IPv4 address

diff --git a/playbooks/debian-add-apache-vhost b/playbooks/debian-add-apache-vhost
index 59eb749d0d75d477ba26de59444f01f11a849a73..822891027566f6ed5a8f1ba22ea6729c6b1d3343 100755 (executable)
--- a/playbooks/debian-add-apache-vhost
+++ b/playbooks/debian-add-apache-vhost
@@ -10,4 +10,5 @@ shift
 
 cd "`dirname \"$0\"`" &&
 ANSIBLE_ROLES_PATH=debian/roles \
-   exec ./run-role add-apache-vhost "$@" -e virtual_host="$vhost"
+   exec ./run-role add-apache-vhost "$@" \
+   -e virtual_host="$vhost" -e gather_facts=true

diff --git a/playbooks/debian-add-dns-domain b/playbooks/debian-add-dns-domain
index b4b865ccf7076c2c93eb63e77296598c72fb4ec3..57ed031db5bb5046275cded5d4d31d4d130d28b4 100755 (executable)
--- a/playbooks/debian-add-dns-domain
+++ b/playbooks/debian-add-dns-domain
@@ -10,4 +10,5 @@ shift
 
 cd "`dirname \"$0\"`" &&
 ANSIBLE_ROLES_PATH=debian/roles \
-   exec ./run-role add-dns-domain "$@" -e domain="$domain"
+   exec ./run-role add-dns-domain "$@" \
+   -e domain="$domain" -e gather_facts=true

diff --git a/playbooks/debian/roles/add-apache-vhost/templates/vhost.conf b/playbooks/debian/roles/add-apache-vhost/templates/vhost.conf
index 2f3dd5b054efac6c798f6db48ce4c08ce47437e5..3ca21deca5f58547cc4d07cb7a1d47aaecd2fe48 100644 (file)
--- a/playbooks/debian/roles/add-apache-vhost/templates/vhost.conf
+++ b/playbooks/debian/roles/add-apache-vhost/templates/vhost.conf
@@ -1,18 +1,18 @@
-<VirtualHost 127.0.0.1:80 {{ virtual_host }}:80>
+<VirtualHost 127.0.0.1:80 {{ ansible_facts.default_ipv4.address }}:80>
 ServerName {{ virtual_host }}
 Redirect permanent / https://{{ virtual_host }}/
 ErrorLog /var/log/apache2/{{ virtual_host }}/error_log
 CustomLog /var/log/apache2/{{ virtual_host }}/access_log common
 </VirtualHost>
 
-<VirtualHost 127.0.0.1:80 {{ virtual_host }}:80>
+<VirtualHost 127.0.0.1:80 {{ ansible_facts.default_ipv4.address }}:80>
 ServerName www.{{ virtual_host }}
 Redirect permanent / https://{{ virtual_host }}/
 ErrorLog /var/log/apache2/{{ virtual_host }}/error_log
 CustomLog /var/log/apache2/{{ virtual_host }}/access_log common
 </VirtualHost>
 
-<VirtualHost 127.0.0.1:443 {{ virtual_host }}:443>
+<VirtualHost 127.0.0.1:443 {{ ansible_facts.default_ipv4.address }}:443>
 ServerName {{ virtual_host }}
 
 DocumentRoot /home/phd/Internet/WWW/htdocs/{{ virtual_host }}
@@ -88,7 +88,7 @@ BrowserMatch "MSIE [2-6]" \
 BrowserMatch "MSIE [17-9]" ssl-unclean-shutdown
 </VirtualHost>
 
-<VirtualHost 127.0.0.1:443 {{ virtual_host }}:443>
+<VirtualHost 127.0.0.1:443 {{ ansible_facts.default_ipv4.address }}:443>
 ServerName www.{{ virtual_host }}
 Redirect permanent / https://{{ virtual_host }}/
 ErrorLog /var/log/apache2/{{ virtual_host }}/error_log

diff --git a/playbooks/debian/roles/add-dns-domain/tasks/main.yml b/playbooks/debian/roles/add-dns-domain/tasks/main.yml
index 8837d99520ad463e1c431e9506b0cb0d3aeb3051..422f28ecd3edd1350ec3bd15575ee3dcbe7cba52 100644 (file)
--- a/playbooks/debian/roles/add-dns-domain/tasks/main.yml
+++ b/playbooks/debian/roles/add-dns-domain/tasks/main.yml
@@ -17,15 +17,14 @@
 - name: Update config
   become: true
   shell: |
-echo '
+    echo '
 
-zone "{{ domain }}" {
-      type master;
-      file "/etc/bind/{{ domain }}";
-      allow-query { any; };
-      notify yes;
-};
-' >> /etc/bind/named.conf.local
+    zone "{{ domain }}" {
+          type master;
+          file "/etc/bind/{{ domain }}";
+          allow-query { any; };
+          notify yes;
+    };' >> /etc/bind/named.conf.local
 
 
   when: not domain_exists.stat.exists

diff --git a/playbooks/debian/roles/add-dns-domain/templates/domain b/playbooks/debian/roles/add-dns-domain/templates/domain
index e2dcd32f0117615d07bc4d968a3f5234f6b42a2b..1bc09135e709a3cc4693e8b1765f36caefbd814c 100644 (file)
--- a/playbooks/debian/roles/add-dns-domain/templates/domain
+++ b/playbooks/debian/roles/add-dns-domain/templates/domain
@@ -7,6 +7,6 @@ $TTL 86400
                           86400)        ; Default TTL 1d
 
         IN      NS      ns1.{{ domain }}.
-        IN      A       ???
-ns1     IN      A       ???
+        IN      A       {{ ansible_facts.default_ipv4.address }}
+ns1     IN      A       {{ ansible_facts.default_ipv4.address }}
 www     IN      CNAME   {{ domain }}.

diff --git a/playbooks/debian/roles/apache/templates/001-phd.conf b/playbooks/debian/roles/apache/templates/001-phd.conf
index 5eb26f6cc58b0a18711006fcb0c15a854a926a5d..1547854999562734b6b30e16bf7b85783c5772ab 100644 (file)
--- a/playbooks/debian/roles/apache/templates/001-phd.conf
+++ b/playbooks/debian/roles/apache/templates/001-phd.conf
@@ -34,7 +34,7 @@ AddDefaultCharset koi8-r
     AuthName Apache
     AuthUserFile /usr/local/apache2/data/apache.passwd
     <RequireAll>
-    Require ip 127.0.0.1 {{ inventory_hostname }}
+    Require ip 127.0.0.1 {{ ansible_facts.default_ipv4.address }}
     Require user phd
     </RequireAll>
 </Location>
@@ -62,21 +62,21 @@ Scriptsock            data/cgisock
 <IfModule mod_info.c>
 <Location /server-info>
     SetHandler server-info
-    Require ip 127.0.0.1 {{ inventory_hostname }}
+    Require ip 127.0.0.1 {{ ansible_facts.default_ipv4.address }}
 </Location>
 </IfModule>
 
 <IfModule mod_status.c>
 <Location /server-status>
     SetHandler server-status
-    Require ip 127.0.0.1 {{ inventory_hostname }}
+    Require ip 127.0.0.1 {{ ansible_facts.default_ipv4.address }}
 </Location>
 
 ExtendedStatus On
 </IfModule>
 
 <Location /printenv.shtml>
-    Require ip 127.0.0.1 {{ inventory_hostname }}
+    Require ip 127.0.0.1 {{ ansible_facts.default_ipv4.address }}
 </Location>
 
 <IfModule mod_env.c>
@@ -107,7 +107,7 @@ RemoveHandler .py
 ErrorDocument 404 /~phd/Bookmarks/notfound.html
 </Location>
 
-<VirtualHost {{ inventory_hostname }}:80>
+<VirtualHost {{ ansible_facts.default_ipv4.address }}:80>
 ServerName unknown.invalid
 DocumentRoot /home/phd/Internet/WWW/htdocs/_default_/
 ErrorDocument 404 /nothing.html

diff --git a/playbooks/debian/roles/named/tasks/main.yml b/playbooks/debian/roles/named/tasks/main.yml
index 9c6d03861e0794a5b322496757e4d9184ef999d6..092d531340c158c69a7c23bbe276fc8216fe3e9c 100644 (file)
--- a/playbooks/debian/roles/named/tasks/main.yml
+++ b/playbooks/debian/roles/named/tasks/main.yml
@@ -1,5 +1,5 @@
 - name: Check named.conf.options
-  shell: "grep -c '^[ \\t]\\+allow-query' /etc/bind/named.conf.options || :"
+  shell: "grep -c '^[ \\t]\\+allow-query' /etc/bind/named.conf.options || echo 0"
   register: named_conf
   changed_when: named_conf.stdout == "0"
 

diff --git a/playbooks/run-role.yml b/playbooks/run-role.yml
index bc179640cb6e2d762434f97ce3e75a59ff8b831f..bf25886f5b877cdfe85cbd061b6d8eb7f6c9fa77 100644 (file)
--- a/playbooks/run-role.yml
+++ b/playbooks/run-role.yml
@@ -1,5 +1,5 @@
 - name: "Run role {{ role }}"
   hosts: "{{ hosts | default('all') }}"
-  gather_facts: false
+  gather_facts: "{{ gather_facts | default('false') }}"
   roles:
     - "{{ role }}"