Correction on DNS setup, again.

This commit is contained in:
Emiliano Vavassori 2016-03-15 19:42:01 +01:00
parent 4992e4032a
commit 7d30b39d28
2 changed files with 18 additions and 22 deletions

View File

@ -20,6 +20,23 @@
when: check_trusted|changed
tags: trustednet
# Preconfiguring DNS anyways
- name: Checking DNS configuration
shell: /sbin/e-smith/db configuration printprop dns NameServers
register: chk_dns
changed_when: "'NameServers={{ ansible_local.domain.extdnsserver1 }},{{ ansible_local.domain.extdnsserver2 }}' not in chk_dns.stdout"
ignore_errors: yes
- name: Configuring DNS resolution
shell: /sbin/e-smith/db configuration setprop dns NameServers {{ ansible_local.domain.extdnsserver1 }},{{ ansible_local.domain.extdnsserver2 }}
when: chk_dns|changed
tags: dns-preset
- name: Activating correct DNS resolution
shell: "/sbin/e-smith/signal-event nethserver-base-update"
when: chk_dns|changed
# Hostname and domainname
- name: Configuring hostname
@ -34,11 +51,6 @@
when: "'{{ ansible_domain }}' != '{{ ansible_local.domain.domainfull }}'"
tags: domainname
- name: Presetting DNS servers
shell: /sbin/e-smith/db configuration setprop dns NameServers {{ ansible_local.domain.extdnsserver1 }},{{ ansible_local.domain.extdnsserver2 }}
when: chg_hostname|changed or chg_domainname|changed
tags: dns-preset
- name: Activating hostname/domainname changes
shell: /sbin/e-smith/signal-event hostname-modify
when: chg_hostname|changed or chg_domainname|changed

View File

@ -22,23 +22,7 @@
when: chk_dhcp|failed
# DNS
- name: Checking DNS configuration
shell: /sbin/e-smith/db configuration printprop dns NameServers
register: chk_dns
changed_when: "'NameServers={{ ansible_local.domain.extdnsserver1 }},{{ ansible_local.domain.extdnsserver2 }}' not in chk_dns.stdout"
ignore_errors: yes
- name: Configuring DNS
shell: /sbin/e-smith/db configuration setprop dns role resolver NameServers "{{ ansible_local.domain.extdnsserver1 }},{{ ansible_local.domain.extdnsserver2 }}"
when: chk_dns|changed
- name: Activating DNS
shell: "/sbin/e-smith/signal-event nethserver-dnsmasq-{{ item }}"
when: chk_dns|changed
with_items:
- save
- update
# Already preconfigured before (roles/nethcfg/tasks/base.yml)
# Avahi