search

freifunkh / ansible

Here we store all Ansible roles and configs used for Freifunk Hannover.
MIT License
7 stars 3 forks source link

Fix meshinput #208

Closed AiyionPrime closed 3 years ago

AiyionPrime commented 3 years ago

This should add vlan-gt-20 to mesh_input and therefor fix #207 ; furthermore the ferm template is now cleaner.

lemoer commented 3 years ago

LGTM

AiyionPrime commented 3 years ago 
--- before: /etc/ferm/ferm.conf
+++ after: /home/aiyion/.ansible/tmp/ansible-local-3398788ss942/tmpid9yhh1a/ferm.conf.j2
@@ -34,12 +34,12 @@
             }

             interface (mesh_fastd) jump MESH_INPUT;
+            interface (bat0) jump MESH_INPUT;
+            interface (vlan-gt-20) jump MESH_INPUT;
             interface (mesh_fastd_10 mesh_fastd_11 mesh_fastd_12 mesh_fastd_13 mesh_fastd_14 mesh_fastd_15 mesh_fastd_16 mesh_fastd_17 mesh_fastd_18 mesh_fastd_19 mesh_fastd_20 mesh_fastd_21 mesh_fastd_22 mesh_fastd_23 mesh_fastd_99 ) jump MESH_INPUT;
+            interface (bat10 bat11 bat12 bat13 bat14 bat15 bat16 bat17 bat18 bat19 bat20 bat21 bat22 bat23 bat99 ) jump MESH_INPUT;
             interface (vlan-gt-210 vlan-gt-211 vlan-gt-212 vlan-gt-213 vlan-gt-214 vlan-gt-215 vlan-gt-216 vlan-gt-217 vlan-gt-218 vlan-gt-219 vlan-gt-220 vlan-gt-221 vlan-gt-222 vlan-gt-223 vlan-gt-299 ) jump MESH_INPUT;
             interface (vx-10 vx-11 vx-12 vx-13 vx-14 vx-15 vx-16 vx-17 vx-18 vx-19 vx-20 vx-21 vx-22 vx-23 vx-99 ) jump MESH_INPUT;
-
-            interface (bat0) jump MESH_INPUT;
-            interface (bat10 bat11 bat12 bat13 bat14 bat15 bat16 bat17 bat18 bat19 bat20 bat21 bat22 bat23 bat99 ) jump MESH_INPUT;
         }
         chain OUTPUT {
             policy ACCEPT;
AiyionPrime commented 3 years ago

tested on sn07