From d76d7b719992ff30b45518436bfa6df33b9b1ab6 Mon Sep 17 00:00:00 2001 From: Matthieu Saulnier Date: Sat, 8 Dec 2018 14:27:54 +0100 Subject: Use host variables in ntp config file template --- host_vars/163.172.211.128 | 4 +++- host_vars/192.168.0.25 | 7 ++++++- host_vars/51.15.179.153 | 4 +++- host_vars/bpr7drsao5vozzr5.onion | 4 +++- host_vars/d72vewh3wa4lwpaj.onion | 7 ++++++- host_vars/manchester.casperlefantom.net | 7 ++++++- host_vars/manchester.home.casperlefantom.net | 7 ++++++- host_vars/ns4.casperlefantom.net | 4 +++- host_vars/ns5.casperlefantom.net | 4 +++- host_vars/wuvphkytdeukbrqm.onion | 4 +++- roles/ntpserver/templates/chrony.conf.j2 | 12 ++---------- roles/ntpserver/templates/ntp.conf.j2 | 12 ++---------- roles/ntpserver/vars/main.yml | 13 ++++--------- 13 files changed, 50 insertions(+), 39 deletions(-) diff --git a/host_vars/163.172.211.128 b/host_vars/163.172.211.128 index a2964f6..03ab67a 100644 --- a/host_vars/163.172.211.128 +++ b/host_vars/163.172.211.128 @@ -6,7 +6,9 @@ bprate: '6 MBytes' bpburst: '7 MBytes' maxadvertised: '5 MBytes' outdoor: true -is_ntpslave: true +# ntpserver +masterlist: + - ntp1.casperlefantom.net # proxy revport: 4435 revports: 4433 diff --git a/host_vars/192.168.0.25 b/host_vars/192.168.0.25 index 873d8fa..ab9f1a2 100644 --- a/host_vars/192.168.0.25 +++ b/host_vars/192.168.0.25 @@ -1,6 +1,11 @@ is_dnsmaster: true -is_ntpmaster: true is_mtamaster: true +# ntpserver +masterlist: + - 0.fedora.pool.ntp.org + - 1.fedora.pool.ntp.org + - 2.fedora.pool.ntp.org + - 3.fedora.pool.ntp.org # torrelay orport: 995 hiddenservices: diff --git a/host_vars/51.15.179.153 b/host_vars/51.15.179.153 index 6b6397d..06e3e18 100644 --- a/host_vars/51.15.179.153 +++ b/host_vars/51.15.179.153 @@ -6,7 +6,9 @@ bprate: '6 MBytes' bpburst: '7 MBytes' maxadvertised: '5 MBytes' outdoor: true -is_ntpslave: true +# ntpserver +masterlist: + - ntp1.casperlefantom.net # common/repos mirrorenable: 0 # reverseproxy diff --git a/host_vars/bpr7drsao5vozzr5.onion b/host_vars/bpr7drsao5vozzr5.onion index 6b6397d..06e3e18 100644 --- a/host_vars/bpr7drsao5vozzr5.onion +++ b/host_vars/bpr7drsao5vozzr5.onion @@ -6,7 +6,9 @@ bprate: '6 MBytes' bpburst: '7 MBytes' maxadvertised: '5 MBytes' outdoor: true -is_ntpslave: true +# ntpserver +masterlist: + - ntp1.casperlefantom.net # common/repos mirrorenable: 0 # reverseproxy diff --git a/host_vars/d72vewh3wa4lwpaj.onion b/host_vars/d72vewh3wa4lwpaj.onion index 873d8fa..ab9f1a2 100644 --- a/host_vars/d72vewh3wa4lwpaj.onion +++ b/host_vars/d72vewh3wa4lwpaj.onion @@ -1,6 +1,11 @@ is_dnsmaster: true -is_ntpmaster: true is_mtamaster: true +# ntpserver +masterlist: + - 0.fedora.pool.ntp.org + - 1.fedora.pool.ntp.org + - 2.fedora.pool.ntp.org + - 3.fedora.pool.ntp.org # torrelay orport: 995 hiddenservices: diff --git a/host_vars/manchester.casperlefantom.net b/host_vars/manchester.casperlefantom.net index 873d8fa..ab9f1a2 100644 --- a/host_vars/manchester.casperlefantom.net +++ b/host_vars/manchester.casperlefantom.net @@ -1,6 +1,11 @@ is_dnsmaster: true -is_ntpmaster: true is_mtamaster: true +# ntpserver +masterlist: + - 0.fedora.pool.ntp.org + - 1.fedora.pool.ntp.org + - 2.fedora.pool.ntp.org + - 3.fedora.pool.ntp.org # torrelay orport: 995 hiddenservices: diff --git a/host_vars/manchester.home.casperlefantom.net b/host_vars/manchester.home.casperlefantom.net index 873d8fa..ab9f1a2 100644 --- a/host_vars/manchester.home.casperlefantom.net +++ b/host_vars/manchester.home.casperlefantom.net @@ -1,6 +1,11 @@ is_dnsmaster: true -is_ntpmaster: true is_mtamaster: true +# ntpserver +masterlist: + - 0.fedora.pool.ntp.org + - 1.fedora.pool.ntp.org + - 2.fedora.pool.ntp.org + - 3.fedora.pool.ntp.org # torrelay orport: 995 hiddenservices: diff --git a/host_vars/ns4.casperlefantom.net b/host_vars/ns4.casperlefantom.net index 6b6397d..06e3e18 100644 --- a/host_vars/ns4.casperlefantom.net +++ b/host_vars/ns4.casperlefantom.net @@ -6,7 +6,9 @@ bprate: '6 MBytes' bpburst: '7 MBytes' maxadvertised: '5 MBytes' outdoor: true -is_ntpslave: true +# ntpserver +masterlist: + - ntp1.casperlefantom.net # common/repos mirrorenable: 0 # reverseproxy diff --git a/host_vars/ns5.casperlefantom.net b/host_vars/ns5.casperlefantom.net index a2964f6..03ab67a 100644 --- a/host_vars/ns5.casperlefantom.net +++ b/host_vars/ns5.casperlefantom.net @@ -6,7 +6,9 @@ bprate: '6 MBytes' bpburst: '7 MBytes' maxadvertised: '5 MBytes' outdoor: true -is_ntpslave: true +# ntpserver +masterlist: + - ntp1.casperlefantom.net # proxy revport: 4435 revports: 4433 diff --git a/host_vars/wuvphkytdeukbrqm.onion b/host_vars/wuvphkytdeukbrqm.onion index a2964f6..03ab67a 100644 --- a/host_vars/wuvphkytdeukbrqm.onion +++ b/host_vars/wuvphkytdeukbrqm.onion @@ -6,7 +6,9 @@ bprate: '6 MBytes' bpburst: '7 MBytes' maxadvertised: '5 MBytes' outdoor: true -is_ntpslave: true +# ntpserver +masterlist: + - ntp1.casperlefantom.net # proxy revport: 4435 revports: 4433 diff --git a/roles/ntpserver/templates/chrony.conf.j2 b/roles/ntpserver/templates/chrony.conf.j2 index eb1f825..a4160b8 100644 --- a/roles/ntpserver/templates/chrony.conf.j2 +++ b/roles/ntpserver/templates/chrony.conf.j2 @@ -1,22 +1,14 @@ # Use public servers from the pool.ntp.org project. # Please consider joining the pool (http://www.pool.ntp.org/join.html). -{% if is_ntpmaster is defined %} -{% for item in primarylist %} -server {{ item }} iburst -{% endfor %} -{% endif %} - -{% if is_ntpmaster is not defined %} +{% if masterlist is defined %} {% for item in masterlist %} server {{ item }} iburst {% endfor %} - -{% if is_ntpslave is not defined %} +{% else %} {% for item in slavelist %} server {{ item }} iburst {% endfor %} {% endif %} -{% endif %} # Ignore stratum in source selection. stratumweight 0 diff --git a/roles/ntpserver/templates/ntp.conf.j2 b/roles/ntpserver/templates/ntp.conf.j2 index f5e3931..982af34 100644 --- a/roles/ntpserver/templates/ntp.conf.j2 +++ b/roles/ntpserver/templates/ntp.conf.j2 @@ -19,23 +19,15 @@ 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 is_ntpmaster is defined %} -{% for item in primarylist %} -server {{ item }} iburst -{% endfor %} -{% endif %} - -{% if is_ntpmaster is not defined %} +{% if masterlist is defined %} {% for item in masterlist %} server {{ item }} iburst {% endfor %} - -{% if is_ntpslave is not defined %} +{% else %} {% for item in slavelist %} server {{ item }} iburst {% endfor %} {% endif %} -{% endif %} #broadcast 192.168.1.255 autokey # broadcast server #broadcastclient # broadcast client diff --git a/roles/ntpserver/vars/main.yml b/roles/ntpserver/vars/main.yml index 6777287..89bc1cf 100644 --- a/roles/ntpserver/vars/main.yml +++ b/roles/ntpserver/vars/main.yml @@ -1,11 +1,6 @@ -primarylist: - - 0.fedora.pool.ntp.org - - 1.fedora.pool.ntp.org - - 2.fedora.pool.ntp.org - - 3.fedora.pool.ntp.org - -masterlist: - - ntp1.casperlefantom.net - slavelist: + - ntp2.casperlefantom.net + - ntp3.casperlefantom.net - ntp4.casperlefantom.net + - ntp5.casperlefantom.net + - ntp1.casperlefantom.net -- cgit