From 68ad649a208c6f8536bfede2ce0ae647d4e3d2b4 Mon Sep 17 00:00:00 2001
From: Matthieu Saulnier <fantom@fedoraproject.org>
Date: Mon, 27 Feb 2017 23:31:52 +0100
Subject: remove obsolete stuff, fix roles errors and update dns role

---
 roles/ntpserver/tasks/pkgs.yml           | 4 ++--
 roles/ntpserver/templates/chrony.conf.j2 | 8 ++++----
 roles/ntpserver/templates/ntp.conf.j2    | 8 ++++----
 roles/ntpserver/vars/main.yml            | 2 --
 4 files changed, 10 insertions(+), 12 deletions(-)
 delete mode 100644 roles/ntpserver/vars/main.yml

(limited to 'roles/ntpserver')

diff --git a/roles/ntpserver/tasks/pkgs.yml b/roles/ntpserver/tasks/pkgs.yml
index 67f3cbf..27e5424 100644
--- a/roles/ntpserver/tasks/pkgs.yml
+++ b/roles/ntpserver/tasks/pkgs.yml
@@ -1,7 +1,7 @@
 - name: Installation du paquet NTP
   yum: name=ntp state=present
-  when: ansible_distribution == "CentOS"
+  when: ansible_pkg_mgr == "yum"
 
 - name: Installation du paquet Chrony
   dnf: name=chrony state=present
-  when: ansible_distribution == "Fedora" and ansible_distribution_version|int >= 22
+  when: ansible_pkg_mgr == "dnf"
diff --git a/roles/ntpserver/templates/chrony.conf.j2 b/roles/ntpserver/templates/chrony.conf.j2
index ba38298..e101f86 100644
--- a/roles/ntpserver/templates/chrony.conf.j2
+++ b/roles/ntpserver/templates/chrony.conf.j2
@@ -1,16 +1,16 @@
 # Use public servers from the pool.ntp.org project.
 # Please consider joining the pool (http://www.pool.ntp.org/join.html).
-{% if ansible_default_ipv6.address == ntp1_ipv6 %}
+{% if ansible_hostname == "lancaster" %}
 server 0.fedora.pool.ntp.org iburst
 server 1.fedora.pool.ntp.org iburst
 server 2.fedora.pool.ntp.org iburst
 server 3.fedora.pool.ntp.org iburst
 {% endif %}
-{% if ansible_default_ipv6.address != ntp1_ipv6 %}
+{% if ansible_hostname != "lancaster" %}
 server ntp1.casperlefantom.net iburst
 {% endif %}
-{% if ansible_default_ipv6.address != ntp2_ipv6 and ansible_default_ipv6.address != ntp1_ipv6 %}
-server ntp2.casperlefantom.net iburst
+{% if ansible_hostname != "vps128389" and ansible_hostname != "lancaster" %}
+server ntp3.casperlefantom.net iburst
 {% endif %}
 
 # Ignore stratum in source selection.
diff --git a/roles/ntpserver/templates/ntp.conf.j2 b/roles/ntpserver/templates/ntp.conf.j2
index 4fd4798..72b18b2 100644
--- a/roles/ntpserver/templates/ntp.conf.j2
+++ b/roles/ntpserver/templates/ntp.conf.j2
@@ -19,17 +19,17 @@ restrict -6 ::1
 
 # Use public servers from the pool.ntp.org project.
 # Please consider joining the pool (http://www.pool.ntp.org/join.html).
-{% if ansible_default_ipv6.address == ntp1_ipv6 %}
+{% if ansible_hostname == "lancaster" %}
 server 0.centos.pool.ntp.org iburst
 server 1.centos.pool.ntp.org iburst
 server 2.centos.pool.ntp.org iburst
 server 3.centos.pool.ntp.org iburst
 {% endif %}
-{% if ansible_default_ipv6.address != ntp1_ipv6 %}
+{% if ansible_hostname != "lancaster" %}
 server ntp1.casperlefantom.net iburst
 {% endif %}
-{% if ansible_default_ipv6.address != ntp2_ipv6 and ansible_default_ipv6.address != ntp1_ipv6 %}
-server ntp2.casperlefantom.net iburst
+{% if ansible_hostname != "vps128389" and ansible_hostname != "lancaster" %}
+server ntp3.casperlefantom.net iburst
 {% endif %}
 
 #broadcast 192.168.1.255 autokey        # broadcast server
diff --git a/roles/ntpserver/vars/main.yml b/roles/ntpserver/vars/main.yml
deleted file mode 100644
index 8654cbd..0000000
--- a/roles/ntpserver/vars/main.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-ntp1_ipv6: 2a01:e35:2f76:7750::4
-ntp2_ipv6: 2a00:c70:1:178:170:111:194:c0de
-- 
cgit