add dns_record role

blogs.yaml

@@ -8,6 +8,7 @@
       ansible_docker_extra_args: blogs
 - hosts: blogs
   roles:
+      - role: dns_record
       - role: wordpress
         site_names:
           - kaos

ldap.yaml

@@ -8,6 +8,7 @@
       ansible_docker_extra_args: ldap
 - hosts: ldap
   roles:
+      - role: dns_record
       - role: ldap
         ldap_domain: 'lilik.it'
         ldap_organization: 'LILiK'

lists.yaml

@@ -8,4 +8,5 @@
       ansible_docker_extra_args: lists
 - hosts: lists
   roles:
+      - role: dns_record
       - role: sympa

mail.yaml

@@ -8,6 +8,7 @@
       ansible_docker_extra_args: mail
 - hosts: mail
   roles:
+      - role: dns_record
       - role: postfix
         ldap_server: "{{ hostvars['ldap'].ansible_host }}"
         fqdn_domain: "mail.lilik.it"

projects.yaml

@@ -9,4 +9,5 @@
       ansible_docker_extra_args: projects
 - hosts: projects
   roles:
+      - role: dns_record
       - role: gitlab

roles/dns_record/tasks/main.yaml

@@ -0,0 +1,12 @@
+- name:
+  lineinfile:
+    dest: '/etc/hosts'
+    line: '{{ ansible_default_ipv4.address }} {{ ansible_hostname }}'
+    regexp: '^\s*\S* {{ ansible_hostname }}'
+  delegate_to: gandalf2
+  register: hosts
+
+- name: restart dnsmasq
+  shell: "/etc/init.d/dnsmasq restart"
+  delegate_to: gandalf2
+  when: hosts.changed

roles/lxc_guest/tasks/main.yaml

@@ -68,9 +68,9 @@
     verbosity: 2
 
 - name: update container DNS configuration
-  shell: lxc-attach -n {{ vm_name }} --clear-env -e -- bash -c "grep '^nameserver {{ hostvars[ext_gateway].ansible_host }}$' /etc/resolv.conf || echo 'nameserver {{ hostvars[ext_gateway].ansible_host }}' > /etc/resolv.conf"
+  shell: lxc-attach -n {{ vm_name }} --clear-env -e -- bash -c "grep -Pz1 'domain lilik.it\nnameserver {{ hostvars[ext_gateway].ansible_host }}' /etc/resolv.conf || echo -e 'domain lilik.it\nnameserver {{ hostvars[ext_gateway].ansible_host }}' > /etc/resolv.conf"
   register: container_dns_configuration
-  changed_when: "container_dns_configuration.stdout != 'nameserver {{ hostvars[ext_gateway].ansible_host }}'"
+  changed_when: container_dns_configuration.stdout != "domain lilik.it\nnameserver {{ hostvars[ext_gateway].ansible_host }}\n\u0000"
 
 - name: update container network configuration
   shell: lxc-attach -n {{ vm_name }} --clear-env -e -- bash -c "grep -F 'iface eth0 inet manual' /etc/network/interfaces || sed -i 's/iface eth0 inet dhcp/iface eth0 inet manual/' /etc/network/interfaces"

users.yaml

@@ -8,6 +8,7 @@
       ansible_docker_extra_args: users
 - hosts: users
   roles:
+      - role: dns_record
       - role: fail2ban
       - role: pam-ldap
         ldap_server: "{{ hostvars['ldap'].ansible_host }}"

webmail.yaml

@@ -8,5 +8,6 @@
       ansible_docker_extra_args: webmail
 - hosts: webmail
   roles:
+      - role: dns_record
       - role: roundcube
         mail_server: "mail.lilik.it"

wiki.yaml

@@ -8,4 +8,5 @@
       ansible_docker_extra_args: wiki
 - hosts: wiki
   roles:
+    - role: dns_record
     - role: dokuwiki