From 5faa5d0ca037921fe69246e31e98714627f7aa4d Mon Sep 17 00:00:00 2001 From: George Hunt Date: Fri, 1 Jul 2022 16:21:31 +0100 Subject: [PATCH] make local network mask correct for 256 --- roles/cups/templates/cups.conf.j2 | 2 +- roles/network/templates/network/bridge-br0 | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/roles/cups/templates/cups.conf.j2 b/roles/cups/templates/cups.conf.j2 index abec5152d..a481aa0b1 100644 --- a/roles/cups/templates/cups.conf.j2 +++ b/roles/cups/templates/cups.conf.j2 @@ -21,7 +21,7 @@ location ~ ^/print(|/.*)$ { # '~' -> '~*' for case-insensitive regex return 301 http://localhost:631; } - return 301 http://$host:631; # For 192.168.0.x, 172.18.96.1, 10.8.0.y ETC + return 301 http://$host:631; # For {{ lan_ip }}, 172.18.96.1, 10.8.0.y ETC } diff --git a/roles/network/templates/network/bridge-br0 b/roles/network/templates/network/bridge-br0 index 8aaa27968..59d85db73 100644 --- a/roles/network/templates/network/bridge-br0 +++ b/roles/network/templates/network/bridge-br0 @@ -6,7 +6,11 @@ interface-name=br0 permissions= [ipv4] +{% if network_172 %} address1={{ lan_ip }}/19 +{% else %} +address1={{ lan_ip }}/24 +{% endif %} dns-search={{ iiab_domain }} method=manual