diff options
| -rw-r--r-- | debian/vyatta-cfg-firewall.install | 1 | ||||
| -rwxr-xr-x | gen-interface-policy-templates.pl | 3 | ||||
| -rwxr-xr-x | gen-interface-templates.pl | 6 |
3 files changed, 4 insertions, 6 deletions
diff --git a/debian/vyatta-cfg-firewall.install b/debian/vyatta-cfg-firewall.install index 8127e80..009b51d 100644 --- a/debian/vyatta-cfg-firewall.install +++ b/debian/vyatta-cfg-firewall.install @@ -9,6 +9,7 @@ opt/vyatta/share/vyatta-cfg/templates/interfaces/bridge opt/vyatta/share/vyatta-cfg/templates/interfaces/ethernet opt/vyatta/share/vyatta-cfg/templates/interfaces/input opt/vyatta/share/vyatta-cfg/templates/interfaces/openvpn +opt/vyatta/share/vyatta-cfg/templates/interfaces/pppoe opt/vyatta/share/vyatta-cfg/templates/interfaces/pseudo-ethernet opt/vyatta/share/vyatta-cfg/templates/interfaces/tunnel opt/vyatta/share/vyatta-cfg/templates/interfaces/vti diff --git a/gen-interface-policy-templates.pl b/gen-interface-policy-templates.pl index e02e85d..991c320 100755 --- a/gen-interface-policy-templates.pl +++ b/gen-interface-policy-templates.pl @@ -43,15 +43,14 @@ my %interface_hash = ( 'bridge/node.tag' => '$VAR(../../@)', 'dummy/node.tag' => '$VAR(../../@)', 'ethernet/node.tag' => '$VAR(../../@)', - 'ethernet/node.tag/pppoe/node.tag' => 'pppoe$VAR(../../@)', 'ethernet/node.tag/vif-s/node.tag' => '$VAR(../../../@).$VAR(../../@)', 'ethernet/node.tag/vif-s/node.tag/vif-c/node.tag' => '$VAR(../../../../@).$VAR(../../../@).$VAR(../../@)', 'ethernet/node.tag/vif/node.tag' => '$VAR(../../../@).$VAR(../../@)', - 'ethernet/node.tag/vif/node.tag/pppoe/node.tag' => 'pppoe$VAR(../../@)', 'input/node.tag' => '$VAR(../../@)', 'l2tpv3/node.tag' => '$VAR(../../@)', 'multilink/node.tag/vif/node.tag' => '$VAR(../../../@)', 'openvpn/node.tag' => '$VAR(../../@)', + 'pppoe/node.tag' => '$VAR(../../@)', 'pseudo-ethernet/node.tag' => '$VAR(../../@)', 'pseudo-ethernet/node.tag/vif-s/node.tag' => '$VAR(../../../@).$VAR(../../@)', 'pseudo-ethernet/node.tag/vif-s/node.tag/vif-c/node.tag' => '$VAR(../../../../@).$VAR(../../../@).$VAR(../../@)', diff --git a/gen-interface-templates.pl b/gen-interface-templates.pl index b1b0a01..9e8db61 100755 --- a/gen-interface-templates.pl +++ b/gen-interface-templates.pl @@ -43,15 +43,14 @@ my %interface_hash = ( 'bridge/node.tag' => '$VAR(../../../@)', 'dummy/node.tag' => '$VAR(../../../@)', 'ethernet/node.tag' => '$VAR(../../../@)', - 'ethernet/node.tag/pppoe/node.tag' => 'pppoe$VAR(../../../@)', 'ethernet/node.tag/vif-s/node.tag' => '$VAR(../../../../@).$VAR(../../../@)', 'ethernet/node.tag/vif-s/node.tag/vif-c/node.tag' => '$VAR(../../../../../@).$VAR(../../../../@).$VAR(../../../@)', 'ethernet/node.tag/vif/node.tag' => '$VAR(../../../../@).$VAR(../../../@)', - 'ethernet/node.tag/vif/node.tag/pppoe/node.tag' => 'pppoe$VAR(../../../@)', 'input/node.tag' => '$VAR(../../../@)', 'l2tpv3/node.tag' => '$VAR(../../../@)', 'multilink/node.tag/vif/node.tag' => '$VAR(../../../../@)', 'openvpn/node.tag' => '$VAR(../../../@)', + 'pppoe/node.tag' => '$VAR(../../../@)', 'pseudo-ethernet/node.tag' => '$VAR(../../../@)', 'pseudo-ethernet/node.tag/vif-s/node.tag' => '$VAR(../../../../@).$VAR(../../../@)', 'pseudo-ethernet/node.tag/vif-s/node.tag/vif-c/node.tag' => '$VAR(../../../../../@).$VAR(../../../../@).$VAR(../../../@)', @@ -74,15 +73,14 @@ my %firewall_hash = ( 'bridge/node.tag' => 'bridge $VAR(../@)', 'dummy/node.tag' => 'dummy $VAR(../@)', 'ethernet/node.tag' => 'ethernet $VAR(../@)', - 'ethernet/node.tag/pppoe/node.tag' => 'ethernet $VAR(../../@) pppoe $VAR(../@)', 'ethernet/node.tag/vif-s/node.tag' => 'ethernet $VAR(../../../@) vif-s $VAR(../@)', 'ethernet/node.tag/vif-s/node.tag/vif-c/node.tag' => 'ethernet $VAR(../../../../@) vif-s $VAR(../../@) vif-c $VAR(../@)', 'ethernet/node.tag/vif/node.tag' => 'ethernet $VAR(../../../@) vif $VAR(../@)', - 'ethernet/node.tag/vif/node.tag/pppoe/node.tag' => 'ethernet $VAR(../../../../@) vif $VAR(../../@) pppoe $VAR(../@)', 'input/node.tag' => 'input $VAR(../@)', 'l2tpv3/node.tag' => 'l2tpv3 $VAR(../@)', 'multilink/node.tag/vif/node.tag' => 'multilink $VAR(../../../@) vif $VAR(../@)', 'openvpn/node.tag' => 'openvpn $VAR(../@)', + 'pppoe/node.tag' => 'pppoe $VAR(../@)', 'pseudo-ethernet/node.tag' => 'pseudo-ethernet $VAR(../@)', 'pseudo-ethernet/node.tag/vif-s/node.tag' => 'pseudo-ethernet $VAR(../../../@) vif-s $VAR(../@)', 'pseudo-ethernet/node.tag/vif-s/node.tag/vif-c/node.tag' => 'pseudo-ethernet $VAR(../../../../@) vif-s $VAR(../../@) vif-c $VAR(../@)', |