diff options
| author | Christian Pointner <equinox@spreadspace.org> | 2020-06-21 20:21:14 +0200 |
|---|---|---|
| committer | Christian Pointner <equinox@spreadspace.org> | 2020-06-21 20:21:14 +0200 |
| commit | 7a0c203380731eaaae03fca8de71cdf9094b0120 (patch) | |
| tree | b9d9a1fd34dce7d259c6a1133b74c0cc36c1df8f /roles/elevate | |
| parent | further improved network config (diff) | |
address vs prefix
Diffstat (limited to 'roles/elevate')
6 files changed, 9 insertions, 9 deletions
diff --git a/roles/elevate/media/templates/firewall/elevate-festival.sh.j2 b/roles/elevate/media/templates/firewall/elevate-festival.sh.j2 index 8cb56cd6..c9d6cb88 100644 --- a/roles/elevate/media/templates/firewall/elevate-festival.sh.j2 +++ b/roles/elevate/media/templates/firewall/elevate-festival.sh.j2 @@ -16,8 +16,8 @@ FILTER6="$IP6TABLES -t filter" MANGLE6="$IP6TABLES -t mangle" LAN_IF="{{ network.primary.name }}" -LAN_IPADDR="{{ network.primary.prefix | ipaddr('address') }}" -LAN_NETMASK="{{ network.primary.prefix | ipaddr('netmask') }}" +LAN_IPADDR="{{ network.primary.address | ipaddr('address') }}" +LAN_NETMASK="{{ network.primary.address | ipaddr('netmask') }}" EXT_IF="wg-gwhetzner" EXT_IPADDR="192.168.254.2" diff --git a/roles/elevate/media/templates/firewall/lan-only.sh.j2 b/roles/elevate/media/templates/firewall/lan-only.sh.j2 index 0ec06ba2..85f0cde4 100644 --- a/roles/elevate/media/templates/firewall/lan-only.sh.j2 +++ b/roles/elevate/media/templates/firewall/lan-only.sh.j2 @@ -16,8 +16,8 @@ FILTER6="$IP6TABLES -t filter" MANGLE6="$IP6TABLES -t mangle" LAN_IF="{{ network.primary.name }}" -LAN_IPADDR="{{ network.primary.prefix | ipaddr('address') }}" -LAN_NETMASK="{{ network.primary.prefix | ipaddr('netmask') }}" +LAN_IPADDR="{{ network.primary.address | ipaddr('address') }}" +LAN_NETMASK="{{ network.primary.address | ipaddr('netmask') }}" ######################### diff --git a/roles/elevate/media/templates/firewall/r3-with-lan.sh.j2 b/roles/elevate/media/templates/firewall/r3-with-lan.sh.j2 index c7fe5f6b..fb2d45a9 100644 --- a/roles/elevate/media/templates/firewall/r3-with-lan.sh.j2 +++ b/roles/elevate/media/templates/firewall/r3-with-lan.sh.j2 @@ -16,8 +16,8 @@ FILTER6="$IP6TABLES -t filter" MANGLE6="$IP6TABLES -t mangle" LAN_IF="{{ network.primary.name }}" -LAN_IPADDR="{{ network.primary.prefix | ipaddr('address') }}" -LAN_NETMASK="{{ network.primary.prefix | ipaddr('netmask') }}" +LAN_IPADDR="{{ network.primary.address | ipaddr('address') }}" +LAN_NETMASK="{{ network.primary.address | ipaddr('netmask') }}" EXT_IF="{{ network.primary.name }}.{{ network_zones.ccinet.vlan }}" EXT_IPADDR="89.106.211.61" diff --git a/roles/elevate/media/templates/netplan/elevate-festival.yaml.j2 b/roles/elevate/media/templates/netplan/elevate-festival.yaml.j2 index ef227fed..9ca54c55 100644 --- a/roles/elevate/media/templates/netplan/elevate-festival.yaml.j2 +++ b/roles/elevate/media/templates/netplan/elevate-festival.yaml.j2 @@ -3,7 +3,7 @@ network: renderer: networkd ethernets: {{ network.primary.name }}: - addresses: [ {{ network.primary.prefix }} ] + addresses: [ {{ network.primary.address }} ] gateway4: {{ network.primary.gateway }} accept-ra: false nameservers: diff --git a/roles/elevate/media/templates/netplan/lan-only.yaml.j2 b/roles/elevate/media/templates/netplan/lan-only.yaml.j2 index ef227fed..9ca54c55 100644 --- a/roles/elevate/media/templates/netplan/lan-only.yaml.j2 +++ b/roles/elevate/media/templates/netplan/lan-only.yaml.j2 @@ -3,7 +3,7 @@ network: renderer: networkd ethernets: {{ network.primary.name }}: - addresses: [ {{ network.primary.prefix }} ] + addresses: [ {{ network.primary.address }} ] gateway4: {{ network.primary.gateway }} accept-ra: false nameservers: diff --git a/roles/elevate/media/templates/netplan/r3-with-lan.yaml.j2 b/roles/elevate/media/templates/netplan/r3-with-lan.yaml.j2 index 296233f4..3dbfeba6 100644 --- a/roles/elevate/media/templates/netplan/r3-with-lan.yaml.j2 +++ b/roles/elevate/media/templates/netplan/r3-with-lan.yaml.j2 @@ -3,7 +3,7 @@ network: renderer: networkd ethernets: {{ network.primary.name }}: - addresses: [ {{ network.primary.prefix }} ] + addresses: [ {{ network.primary.address }} ] accept-ra: false vlans: {{ network.primary.name }}.{{ network_zones.ccinet.vlan }}: |