diff options
| -rw-r--r-- | roles/ntpserver/templates/chrony.conf.j2 | 4 | ||||
| -rw-r--r-- | roles/ntpserver/templates/ntp.conf.j2 | 4 | ||||
| -rw-r--r-- | roles/ntpserver/vars/main.yml | 5 | ||||
| -rw-r--r-- | roles/proxy/defaults/main.yml | 1 | ||||
| -rw-r--r-- | roles/proxy/templates/squid.conf.j2 | 4 |
5 files changed, 18 insertions, 0 deletions
diff --git a/roles/ntpserver/templates/chrony.conf.j2 b/roles/ntpserver/templates/chrony.conf.j2 index a4160b8..e7e2fd1 100644 --- a/roles/ntpserver/templates/chrony.conf.j2 +++ b/roles/ntpserver/templates/chrony.conf.j2 @@ -4,6 +4,10 @@ {% for item in masterlist %} server {{ item }} iburst {% endfor %} +{% elif ansible_default_ipv4.network == localnet %} +{% for item in masterlocal %} +server {{ item }} iburst +{% endfor %} {% else %} {% for item in slavelist %} server {{ item }} iburst diff --git a/roles/ntpserver/templates/ntp.conf.j2 b/roles/ntpserver/templates/ntp.conf.j2 index 982af34..820a5cb 100644 --- a/roles/ntpserver/templates/ntp.conf.j2 +++ b/roles/ntpserver/templates/ntp.conf.j2 @@ -23,6 +23,10 @@ restrict -6 ::1 {% for item in masterlist %} server {{ item }} iburst {% endfor %} +{% elif ansible_default_ipv4.network == localnet %} +{% for item in masterlocal %} +server {{ item }} iburst +{% endfor %} {% else %} {% for item in slavelist %} server {{ item }} iburst diff --git a/roles/ntpserver/vars/main.yml b/roles/ntpserver/vars/main.yml index 89bc1cf..b7a27cf 100644 --- a/roles/ntpserver/vars/main.yml +++ b/roles/ntpserver/vars/main.yml @@ -1,3 +1,8 @@ +localnet: 192.168.0.0 + +masterlocal: + - ntp1.home.casperlefantom.net + slavelist: - ntp2.casperlefantom.net - ntp3.casperlefantom.net diff --git a/roles/proxy/defaults/main.yml b/roles/proxy/defaults/main.yml index 53f1dec..83803a5 100644 --- a/roles/proxy/defaults/main.yml +++ b/roles/proxy/defaults/main.yml @@ -1,3 +1,4 @@ +localnet: 192.168.0.0 fwdport: 8200 revport: 80 revports: 443 diff --git a/roles/proxy/templates/squid.conf.j2 b/roles/proxy/templates/squid.conf.j2 index 2be3623..01e80ff 100644 --- a/roles/proxy/templates/squid.conf.j2 +++ b/roles/proxy/templates/squid.conf.j2 @@ -85,7 +85,11 @@ debug_options ALL,2 # infos admin cache_mgr {{ email }} +{% if ansible_default_ipv4.network == localnet %} +visible_hostname {{ ansible_hostname }}.home.casperlefantom.net +{% else %} visible_hostname {{ ansible_hostname }}.casperlefantom.net +{% endif %} httpd_suppress_version_string on # augmenter la taille des objets |