From 7d30b39d28e0cc21bf85a490cddfdad804f49559 Mon Sep 17 00:00:00 2001 From: Emiliano Vavassori Date: Tue, 15 Mar 2016 19:42:01 +0100 Subject: [PATCH] Correction on DNS setup, again. --- roles/nethcfg/tasks/base.yml | 22 +++++++++++++++++----- roles/nethcfg/tasks/dhcpdns.yml | 18 +----------------- 2 files changed, 18 insertions(+), 22 deletions(-) diff --git a/roles/nethcfg/tasks/base.yml b/roles/nethcfg/tasks/base.yml index bd5f904..d005ea8 100644 --- a/roles/nethcfg/tasks/base.yml +++ b/roles/nethcfg/tasks/base.yml @@ -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 diff --git a/roles/nethcfg/tasks/dhcpdns.yml b/roles/nethcfg/tasks/dhcpdns.yml index 585d9db..ba51f16 100644 --- a/roles/nethcfg/tasks/dhcpdns.yml +++ b/roles/nethcfg/tasks/dhcpdns.yml @@ -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