From 0cdef19a7ce8f8e941c45974857bf7c3f636fc59 Mon Sep 17 00:00:00 2001 From: Astro Date: Wed, 16 Jun 2021 13:49:55 +0200 Subject: [PATCH] nix/pkgs/ap.sh: fix switchnum --- nix/pkgs/ap.sh | 24 ++++++------------------ 1 file changed, 6 insertions(+), 18 deletions(-) diff --git a/nix/pkgs/ap.sh b/nix/pkgs/ap.sh index 85dd7ff..4c3df07 100644 --- a/nix/pkgs/ap.sh +++ b/nix/pkgs/ap.sh @@ -64,8 +64,7 @@ set network.@switch_vlan[0].device='switch0' set network.@switch_vlan[0].vlan='1' set network.@switch_vlan[0].ports='0t 1t' set network.@switch_vlan[0].comment='mgmt' -{% set switchnum = 1 %} -{%- for net in bridges.keys() %} +{%- for net, switchnum in zip(bridges.keys(), range(1, 999)) %} set network.@switch_vlan[{{ switchnum }}]=switch_vlan set network.@switch_vlan[{{ switchnum }}].device='switch0' set network.@switch_vlan[{{ switchnum }}].vlan='{{ pillar['vlans'][net] }}' @@ -75,7 +74,6 @@ set network.@switch_vlan[{{ switchnum }}].ports='0t 1t 2 3 4 5' set network.@switch_vlan[{{ switchnum }}].ports='0t 1t' {%- endif %} set network.@switch_vlan[{{ switchnum }}].comment='{{ net }}' -{% set switchnum = switchnum + 1 %} {%- endfor %} {{ uci_network_mgmt('eth0.1') }} @@ -99,8 +97,7 @@ set network.@switch_vlan[0].device='switch0' set network.@switch_vlan[0].vlan='1' set network.@switch_vlan[0].ports='5t 6t' set network.@switch_vlan[0].comment='mgmt' -{% set switchnum = 1 %} -{%- for net in bridges.keys() %} +{%- for net, switchnum in zip(bridges.keys(), range(1, 999)) %} set network.@switch_vlan[{{ switchnum }}]=switch_vlan set network.@switch_vlan[{{ switchnum }}].device='switch0' set network.@switch_vlan[{{ switchnum }}].vlan='{{ pillar['vlans'][net] }}' @@ -111,7 +108,6 @@ set network.@switch_vlan[{{ switchnum }}].ports='0 1 2 3 4 5t' set network.@switch_vlan[{{ switchnum }}].ports='5t 6t' {%- endif %} set network.@switch_vlan[{{ switchnum }}].comment='{{ net }}' -{% set switchnum = switchnum + 1 %} {%- endfor %} {{ uci_network_mgmt('eth0.1') }} @@ -139,8 +135,7 @@ set network.@switch_vlan[0].device='switch0' set network.@switch_vlan[0].vlan='1' set network.@switch_vlan[0].ports='1t 6t' set network.@switch_vlan[0].comment='mgmt' -{% set switchnum = 1 %} -{%- for net in bridges.keys() %} +{%- for net, switchnum in zip(bridges.keys(), range(1, 999)) %} set network.@switch_vlan[{{ switchnum }}]=switch_vlan set network.@switch_vlan[{{ switchnum }}].device='switch0' set network.@switch_vlan[{{ switchnum }}].vlan='{{ pillar['vlans'][net] }}' @@ -151,7 +146,6 @@ set network.@switch_vlan[{{ switchnum }}].ports='0 1t 2 3 4 5' set network.@switch_vlan[{{ switchnum }}].ports='1t 6t' {%- endif %} set network.@switch_vlan[{{ switchnum }}].comment='{{ net }}' -{% set switchnum = switchnum + 1 %} {%- endfor %} {{ uci_network_mgmt('eth0.1') }} @@ -178,8 +172,7 @@ set network.@switch_vlan[0].device='switch0' set network.@switch_vlan[0].vlan='1' set network.@switch_vlan[0].ports='0t 1t' set network.@switch_vlan[0].comment='mgmt' -{% set switchnum = 1 %} -{%- for net in bridges.keys() %} +{%- for net, switchnum in zip(bridges.keys(), range(1, 999)) %} set network.@switch_vlan[{{ switchnum }}]=switch_vlan set network.@switch_vlan[{{ switchnum }}].device='switch0' set network.@switch_vlan[{{ switchnum }}].vlan='{{ pillar['vlans'][net] }}' @@ -190,7 +183,6 @@ set network.@switch_vlan[{{ switchnum }}].ports='0t 1t 2 3 4 5' set network.@switch_vlan[{{ switchnum }}].ports='0t 1t' {%- endif %} set network.@switch_vlan[{{ switchnum }}].comment='{{ net }}' -{% set switchnum = switchnum + 1 %} {%- endfor %} {{ uci_network_mgmt('eth0.1') }} @@ -213,8 +205,7 @@ set network.@switch_vlan[0].device='switch0' set network.@switch_vlan[0].vlan='1' set network.@switch_vlan[0].ports='0t 5t' set network.@switch_vlan[0].comment='mgmt' -{% set switchnum = 1 %} -{%- for net in bridges.keys() %} +{%- for net, switchnum in zip(bridges.keys(), range(1, 999)) %} set network.@switch_vlan[{{ switchnum }}]=switch_vlan set network.@switch_vlan[{{ switchnum }}].device='switch0' set network.@switch_vlan[{{ switchnum }}].vlan='{{ pillar['vlans'][net] }}' @@ -225,7 +216,6 @@ set network.@switch_vlan[{{ switchnum }}].ports='0t 1 2 3 4 5t' set network.@switch_vlan[{{ switchnum }}].ports='0t 5t' {%- endif %} set network.@switch_vlan[{{ switchnum }}].comment='{{ net }}' -{% set switchnum = switchnum + 1 %} {%- endfor %} {{ uci_network_mgmt('eth0.1') }} @@ -328,8 +318,7 @@ set network.@switch_vlan[0].device='switch0' set network.@switch_vlan[0].vlan='1' set network.@switch_vlan[0].ports='4t 6t' set network.@switch_vlan[0].comment='mgmt' -{% set switchnum = 1 %} -{%- for net in bridges.keys() %} +{%- for net, switchnum in zip(bridges.keys(), range(1, 999)) %} set network.@switch_vlan[{{ switchnum }}]=switch_vlan set network.@switch_vlan[{{ switchnum }}].device='switch0' set network.@switch_vlan[{{ switchnum }}].vlan='{{ pillar['vlans'][net] }}' @@ -339,7 +328,6 @@ set network.@switch_vlan[{{ switchnum }}].ports='0 1 2 3 4t 6t' set network.@switch_vlan[{{ switchnum }}].ports='4t 6t' {%- endif %} set network.@switch_vlan[{{ switchnum }}].comment='{{ net }}' -{% set switchnum = switchnum + 1 %} {%- endfor %} {{ uci_network_mgmt('eth0.1') }}