diff --git a/cesnet-central/playbooks/templates/etc/squid/conf.d/allcluster.conf b/cesnet-central/playbooks/templates/etc/squid/conf.d/allcluster.conf index 1449303a1455865631097618e15b39ead561090f..56885f9ca82701444b7a618b3395b530b03b875b 100644 --- a/cesnet-central/playbooks/templates/etc/squid/conf.d/allcluster.conf +++ b/cesnet-central/playbooks/templates/etc/squid/conf.d/allcluster.conf @@ -1,7 +1,11 @@ {% for host in groups['ingress'] + groups['nfs'] + groups['worker'] + groups['gpu'] -%} +{% if hostvars[host].ansible_default_ipv6.address is defined %} acl allcluster src {{ hostvars[host].ansible_default_ipv6.address }} +{% endif %} {% endfor -%} {% for host in groups['ingress'] + groups['nfs'] + groups['worker'] + groups['gpu'] -%} +{% if hostvars[host].ansible_default_ipv4.address is defined %} acl allcluster src {{ hostvars[host].ansible_default_ipv4.address }} +{% endif %} {% endfor -%} http_access allow allcluster diff --git a/staging/playbooks/templates/etc/squid/conf.d/allcluster.conf b/staging/playbooks/templates/etc/squid/conf.d/allcluster.conf deleted file mode 100644 index 2bd09266fa51feb624492e107907c23ccf79fe1d..0000000000000000000000000000000000000000 --- a/staging/playbooks/templates/etc/squid/conf.d/allcluster.conf +++ /dev/null @@ -1,4 +0,0 @@ -{% for host in groups['ingress'] + groups['nfs'] + groups['worker'] + groups['gpu'] -%} -acl allcluster src {{ hostvars[host].ansible_default_ipv4.address }} -{% endfor -%} -http_access allow allcluster diff --git a/staging/playbooks/templates/etc/squid/conf.d/allcluster.conf b/staging/playbooks/templates/etc/squid/conf.d/allcluster.conf new file mode 120000 index 0000000000000000000000000000000000000000..3ac6e9a8601bfe7cfe33bcd7dd828f9d815f9125 --- /dev/null +++ b/staging/playbooks/templates/etc/squid/conf.d/allcluster.conf @@ -0,0 +1 @@ +../../../../../../cesnet-central/playbooks/templates/etc/squid/conf.d/allcluster.conf \ No newline at end of file