Remove per-interface firewall templates; They are now generated.

77 files changed, 0 insertions, 634 deletions

diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/bridged-ethernet/firewall/in/name/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/bridged-ethernet/firewall/in/name/node.def
deleted file mode 100644
index 871d2c4..0000000
--- a/templates/interfaces/adsl/node.tag/pvc/node.tag/bridged-ethernet/firewall/in/name/node.def
+++ /dev/null
@@ -1,18 +0,0 @@
-type: txt
-
-help: Set inbound interface filter name
-
-create:expression: "sh -c \"echo create if=[$VAR(../../../../../@)] dir=[$VAR(..)] name=[$VAR(@)] \
->> /tmp/cli.log && \
-sudo /opt/vyatta/sbin/vyatta-firewall.pl \
---update-interfaces update $VAR(../../../../../@) $VAR(..) $VAR(@)\" "
-
-update:expression: "sh -c \"echo update if=[$VAR(../../../../../@)] dir=[$VAR(..)] name=[$VAR(@)] \
->> /tmp/cli.log && \
-sudo /opt/vyatta/sbin/vyatta-firewall.pl \
---update-interfaces update $VAR(../../../../../@) $VAR(..) $VAR(@)\" "
-
-delete:expression: "sh -c \"echo delete if=[$VAR(../../../../../@)] dir=[$VAR(..)] name=[$VAR(@)] \
->> /tmp/cli.log && \
-sudo /opt/vyatta/sbin/vyatta-firewall.pl \
---update-interfaces delete $VAR(../../../../../@) $VAR(..) $VAR(@)\" "
diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/bridged-ethernet/firewall/in/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/bridged-ethernet/firewall/in/node.def
deleted file mode 100644
index eccc79b..0000000
--- a/templates/interfaces/adsl/node.tag/pvc/node.tag/bridged-ethernet/firewall/in/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Set filter for forwarded packets on inbound interface
diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/bridged-ethernet/firewall/local/name/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/bridged-ethernet/firewall/local/name/node.def
deleted file mode 100644
index 9a025ec..0000000
--- a/templates/interfaces/adsl/node.tag/pvc/node.tag/bridged-ethernet/firewall/local/name/node.def
+++ /dev/null
@@ -1,18 +0,0 @@
-type: txt
-
-help: Set local filter name
-
-create:expression: "sh -c \"echo create if=[$VAR(../../../../../@)] dir=[$VAR(..)] name=[$VAR(@)] \
->> /tmp/cli.log && \
-sudo /opt/vyatta/sbin/vyatta-firewall.pl \
---update-interfaces update $VAR(../../../../../@) $VAR(..) $VAR(@)\" "
-
-update:expression: "sh -c \"echo update if=[$VAR(../../../../../@)] dir=[$VAR(..)] name=[$VAR(@)] \
->> /tmp/cli.log && \
-sudo /opt/vyatta/sbin/vyatta-firewall.pl \
---update-interfaces update $VAR(../../../../../@) $VAR(..) $VAR(@)\" "
-
-delete:expression: "sh -c \"echo delete if=[$VAR(../../../../../@)] dir=[$VAR(..)] name=[$VAR(@)] \
->> /tmp/cli.log && \
-sudo /opt/vyatta/sbin/vyatta-firewall.pl \
---update-interfaces delete $VAR(../../../../../@) $VAR(..) $VAR(@)\" "
diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/bridged-ethernet/firewall/local/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/bridged-ethernet/firewall/local/node.def
deleted file mode 100644
index 2595835..0000000
--- a/templates/interfaces/adsl/node.tag/pvc/node.tag/bridged-ethernet/firewall/local/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Set filter for packets destined for this router
diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/bridged-ethernet/firewall/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/bridged-ethernet/firewall/node.def
deleted file mode 100644
index 11748d2..0000000
--- a/templates/interfaces/adsl/node.tag/pvc/node.tag/bridged-ethernet/firewall/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Set firewall options
diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/bridged-ethernet/firewall/out/name/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/bridged-ethernet/firewall/out/name/node.def
deleted file mode 100644
index e1a82da..0000000
--- a/templates/interfaces/adsl/node.tag/pvc/node.tag/bridged-ethernet/firewall/out/name/node.def
+++ /dev/null
@@ -1,18 +0,0 @@
-type: txt
-
-help: Set outbound interface filter name
-
-create:expression: "sh -c \"echo create if=[$VAR(../../../../../@)] dir=[$VAR(..)] name=[$VAR(@)] \
->> /tmp/cli.log && \
-sudo /opt/vyatta/sbin/vyatta-firewall.pl \
---update-interfaces update $VAR(../../../../../@) $VAR(..) $VAR(@)\" "
-
-update:expression: "sh -c \"echo update if=[$VAR(../../../../../@)] dir=[$VAR(..)] name=[$VAR(@)] \
->> /tmp/cli.log && \
-sudo /opt/vyatta/sbin/vyatta-firewall.pl \
---update-interfaces update $VAR(../../../../../@) $VAR(..) $VAR(@)\" "
-
-delete:expression: "sh -c \"echo delete if=[$VAR(../../../../../@)] dir=[$VAR(..)] name=[$VAR(@)] \
->> /tmp/cli.log && \
-sudo /opt/vyatta/sbin/vyatta-firewall.pl \
---update-interfaces delete $VAR(../../../../../@) $VAR(..) $VAR(@)\" "
diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/bridged-ethernet/firewall/out/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/bridged-ethernet/firewall/out/node.def
deleted file mode 100644
index 3aec5f0..0000000
--- a/templates/interfaces/adsl/node.tag/pvc/node.tag/bridged-ethernet/firewall/out/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Set filter for forwarded packets on outbound interface
diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/firewall/in/name/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/firewall/in/name/node.def
deleted file mode 100644
index 871d2c4..0000000
--- a/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/firewall/in/name/node.def
+++ /dev/null
@@ -1,18 +0,0 @@
-type: txt
-
-help: Set inbound interface filter name
-
-create:expression: "sh -c \"echo create if=[$VAR(../../../../../@)] dir=[$VAR(..)] name=[$VAR(@)] \
->> /tmp/cli.log && \
-sudo /opt/vyatta/sbin/vyatta-firewall.pl \
---update-interfaces update $VAR(../../../../../@) $VAR(..) $VAR(@)\" "
-
-update:expression: "sh -c \"echo update if=[$VAR(../../../../../@)] dir=[$VAR(..)] name=[$VAR(@)] \
->> /tmp/cli.log && \
-sudo /opt/vyatta/sbin/vyatta-firewall.pl \
---update-interfaces update $VAR(../../../../../@) $VAR(..) $VAR(@)\" "
-
-delete:expression: "sh -c \"echo delete if=[$VAR(../../../../../@)] dir=[$VAR(..)] name=[$VAR(@)] \
->> /tmp/cli.log && \
-sudo /opt/vyatta/sbin/vyatta-firewall.pl \
---update-interfaces delete $VAR(../../../../../@) $VAR(..) $VAR(@)\" "
diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/firewall/in/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/firewall/in/node.def
deleted file mode 100644
index eccc79b..0000000
--- a/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/firewall/in/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Set filter for forwarded packets on inbound interface
diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/firewall/local/name/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/firewall/local/name/node.def
deleted file mode 100644
index 9a025ec..0000000
--- a/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/firewall/local/name/node.def
+++ /dev/null
@@ -1,18 +0,0 @@
-type: txt
-
-help: Set local filter name
-
-create:expression: "sh -c \"echo create if=[$VAR(../../../../../@)] dir=[$VAR(..)] name=[$VAR(@)] \
->> /tmp/cli.log && \
-sudo /opt/vyatta/sbin/vyatta-firewall.pl \
---update-interfaces update $VAR(../../../../../@) $VAR(..) $VAR(@)\" "
-
-update:expression: "sh -c \"echo update if=[$VAR(../../../../../@)] dir=[$VAR(..)] name=[$VAR(@)] \
->> /tmp/cli.log && \
-sudo /opt/vyatta/sbin/vyatta-firewall.pl \
---update-interfaces update $VAR(../../../../../@) $VAR(..) $VAR(@)\" "
-
-delete:expression: "sh -c \"echo delete if=[$VAR(../../../../../@)] dir=[$VAR(..)] name=[$VAR(@)] \
->> /tmp/cli.log && \
-sudo /opt/vyatta/sbin/vyatta-firewall.pl \
---update-interfaces delete $VAR(../../../../../@) $VAR(..) $VAR(@)\" "
diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/firewall/local/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/firewall/local/node.def
deleted file mode 100644
index 2595835..0000000
--- a/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/firewall/local/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Set filter for packets destined for this router
diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/firewall/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/firewall/node.def
deleted file mode 100644
index 11748d2..0000000
--- a/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/firewall/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Set firewall options
diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/firewall/out/name/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/firewall/out/name/node.def
deleted file mode 100644
index e1a82da..0000000
--- a/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/firewall/out/name/node.def
+++ /dev/null
@@ -1,18 +0,0 @@
-type: txt
-
-help: Set outbound interface filter name
-
-create:expression: "sh -c \"echo create if=[$VAR(../../../../../@)] dir=[$VAR(..)] name=[$VAR(@)] \
->> /tmp/cli.log && \
-sudo /opt/vyatta/sbin/vyatta-firewall.pl \
---update-interfaces update $VAR(../../../../../@) $VAR(..) $VAR(@)\" "
-
-update:expression: "sh -c \"echo update if=[$VAR(../../../../../@)] dir=[$VAR(..)] name=[$VAR(@)] \
->> /tmp/cli.log && \
-sudo /opt/vyatta/sbin/vyatta-firewall.pl \
---update-interfaces update $VAR(../../../../../@) $VAR(..) $VAR(@)\" "
-
-delete:expression: "sh -c \"echo delete if=[$VAR(../../../../../@)] dir=[$VAR(..)] name=[$VAR(@)] \
->> /tmp/cli.log && \
-sudo /opt/vyatta/sbin/vyatta-firewall.pl \
---update-interfaces delete $VAR(../../../../../@) $VAR(..) $VAR(@)\" "
diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/firewall/out/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/firewall/out/node.def
deleted file mode 100644
index 3aec5f0..0000000
--- a/templates/interfaces/adsl/node.tag/pvc/node.tag/classical-ipoa/firewall/out/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Set filter for forwarded packets on outbound interface
diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/firewall/in/name/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/firewall/in/name/node.def
deleted file mode 100644
index f56809c..0000000
--- a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/firewall/in/name/node.def
+++ /dev/null
@@ -1,18 +0,0 @@
-type: txt
-
-help: Set inbound interface filter name
-
-create:expression: "sh -c \"echo create pppoa=[$VAR(../../../@)] dir=[$VAR(..)] name=[$VAR(@)] \
->> /tmp/cli.log && \
-sudo /opt/vyatta/sbin/vyatta-firewall.pl \
---update-interfaces update pppoa$VAR(../../../@) $VAR(..) $VAR(@)\" "
-
-update:expression: "sh -c \"echo update pppoa=[$VAR(../../../@)] dir=[$VAR(..)] name=[$VAR(@)] \
->> /tmp/cli.log && \
-sudo /opt/vyatta/sbin/vyatta-firewall.pl \
---update-interfaces update pppoa$VAR(../../../@) $VAR(..) $VAR(@)\" "
-
-delete:expression: "sh -c \"echo delete pppoa=[$VAR(../../../@)] dir=[$VAR(..)] name=[$VAR(@)] \
->> /tmp/cli.log && \
-sudo /opt/vyatta/sbin/vyatta-firewall.pl \
---update-interfaces delete pppoa$VAR(../../../@) $VAR(..) $VAR(@)\" "
diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/firewall/in/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/firewall/in/node.def
deleted file mode 100644
index eccc79b..0000000
--- a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/firewall/in/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Set filter for forwarded packets on inbound interface
diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/firewall/local/name/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/firewall/local/name/node.def
deleted file mode 100644
index 6bfd469..0000000
--- a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/firewall/local/name/node.def
+++ /dev/null
@@ -1,18 +0,0 @@
-type: txt
-
-help: Set local filter name
-
-create:expression: "sh -c \"echo create pppoa=[$VAR(../../../@)] dir=[$VAR(..)] name=[$VAR(@)] \
->> /tmp/cli.log && \
-sudo /opt/vyatta/sbin/vyatta-firewall.pl \
---update-interfaces update pppoa$VAR(../../../@) $VAR(..) $VAR(@)\" "
-
-update:expression: "sh -c \"echo update pppoa=[$VAR(../../../@)] dir=[$VAR(..)] name=[$VAR(@)] \
->> /tmp/cli.log && \
-sudo /opt/vyatta/sbin/vyatta-firewall.pl \
---update-interfaces update pppoa$VAR(../../../@) $VAR(..) $VAR(@)\" "
-
-delete:expression: "sh -c \"echo delete pppoa=[$VAR(../../../@)] dir=[$VAR(..)] name=[$VAR(@)] \
->> /tmp/cli.log && \
-sudo /opt/vyatta/sbin/vyatta-firewall.pl \
---update-interfaces delete pppoa$VAR(../../../@) $VAR(..) $VAR(@)\" "
diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/firewall/local/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/firewall/local/node.def
deleted file mode 100644
index 2595835..0000000
--- a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/firewall/local/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Set filter for packets destined for this router
diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/firewall/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/firewall/node.def
deleted file mode 100644
index 11748d2..0000000
--- a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/firewall/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Set firewall options
diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/firewall/out/name/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/firewall/out/name/node.def
deleted file mode 100644
index d2000c1..0000000
--- a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/firewall/out/name/node.def
+++ /dev/null
@@ -1,18 +0,0 @@
-type: txt
-
-help: Set outbound interface filter name
-
-create:expression: "sh -c \"echo create pppoa=[$VAR(../../../@)] dir=[$VAR(..)] name=[$VAR(@)] \
->> /tmp/cli.log && \
-sudo /opt/vyatta/sbin/vyatta-firewall.pl \
---update-interfaces update pppoa$VAR(../../../@) $VAR(..) $VAR(@)\" "
-
-update:expression: "sh -c \"echo update pppoa=[$VAR(../../../@)] dir=[$VAR(..)] name=[$VAR(@)] \
->> /tmp/cli.log && \
-sudo /opt/vyatta/sbin/vyatta-firewall.pl \
---update-interfaces update pppoa$VAR(../../../@) $VAR(..) $VAR(@)\" "
-
-delete:expression: "sh -c \"echo delete pppoa=[$VAR(../../../@)] dir=[$VAR(..)] name=[$VAR(@)] \
->> /tmp/cli.log && \
-sudo /opt/vyatta/sbin/vyatta-firewall.pl \
---update-interfaces delete pppoa$VAR(../../../@) $VAR(..) $VAR(@)\" "
diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/firewall/out/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/firewall/out/node.def
deleted file mode 100644
index 3aec5f0..0000000
--- a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoa/node.tag/firewall/out/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Set filter for forwarded packets on outbound interface
diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/firewall/in/name/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/firewall/in/name/node.def
deleted file mode 100644
index 6e629bc..0000000
--- a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/firewall/in/name/node.def
+++ /dev/null
@@ -1,18 +0,0 @@
-type: txt
-
-help: Set inbound interface filter name
-
-create:expression: "sh -c \"echo create pppoe=[$VAR(../../../@)] dir=[$VAR(..)] name=[$VAR(@)] \
->> /tmp/cli.log && \
-sudo /opt/vyatta/sbin/vyatta-firewall.pl \
---update-interfaces update pppoe$VAR(../../../@) $VAR(..) $VAR(@)\" "
-
-update:expression: "sh -c \"echo update pppoe=[$VAR(../../../@)] dir=[$VAR(..)] name=[$VAR(@)] \
->> /tmp/cli.log && \
-sudo /opt/vyatta/sbin/vyatta-firewall.pl \
---update-interfaces update pppoe$VAR(../../../@) $VAR(..) $VAR(@)\" "
-
-delete:expression: "sh -c \"echo delete pppoe=[$VAR(../../../@)] dir=[$VAR(..)] name=[$VAR(@)] \
->> /tmp/cli.log && \
-sudo /opt/vyatta/sbin/vyatta-firewall.pl \
---update-interfaces delete pppoe$VAR(../../../@) $VAR(..) $VAR(@)\" "
diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/firewall/in/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/firewall/in/node.def
deleted file mode 100644
index eccc79b..0000000
--- a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/firewall/in/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Set filter for forwarded packets on inbound interface
diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/firewall/local/name/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/firewall/local/name/node.def
deleted file mode 100644
index 44e85d1..0000000
--- a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/firewall/local/name/node.def
+++ /dev/null
@@ -1,18 +0,0 @@
-type: txt
-
-help: Set local filter name
-
-create:expression: "sh -c \"echo create pppoe=[$VAR(../../../@)] dir=[$VAR(..)] name=[$VAR(@)] \
->> /tmp/cli.log && \
-sudo /opt/vyatta/sbin/vyatta-firewall.pl \
---update-interfaces update pppoe$VAR(../../../@) $VAR(..) $VAR(@)\" "
-
-update:expression: "sh -c \"echo update pppoe=[$VAR(../../../@)] dir=[$VAR(..)] name=[$VAR(@)] \
->> /tmp/cli.log && \
-sudo /opt/vyatta/sbin/vyatta-firewall.pl \
---update-interfaces update pppoe$VAR(../../../@) $VAR(..) $VAR(@)\" "
-
-delete:expression: "sh -c \"echo delete pppoe=[$VAR(../../../@)] dir=[$VAR(..)] name=[$VAR(@)] \
->> /tmp/cli.log && \
-sudo /opt/vyatta/sbin/vyatta-firewall.pl \
---update-interfaces delete pppoe$VAR(../../../@) $VAR(..) $VAR(@)\" "
diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/firewall/local/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/firewall/local/node.def
deleted file mode 100644
index 2595835..0000000
--- a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/firewall/local/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Set filter for packets destined for this router
diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/firewall/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/firewall/node.def
deleted file mode 100644
index 11748d2..0000000
--- a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/firewall/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Set firewall options
diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/firewall/out/name/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/firewall/out/name/node.def
deleted file mode 100644
index 2c37224..0000000
--- a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/firewall/out/name/node.def
+++ /dev/null
@@ -1,18 +0,0 @@
-type: txt
-
-help: Set outbound interface filter name
-
-create:expression: "sh -c \"echo create pppoe=[$VAR(../../../@)] dir=[$VAR(..)] name=[$VAR(@)] \
->> /tmp/cli.log && \
-sudo /opt/vyatta/sbin/vyatta-firewall.pl \
---update-interfaces update pppoe$VAR(../../../@) $VAR(..) $VAR(@)\" "
-
-update:expression: "sh -c \"echo update pppoe=[$VAR(../../../@)] dir=[$VAR(..)] name=[$VAR(@)] \
->> /tmp/cli.log && \
-sudo /opt/vyatta/sbin/vyatta-firewall.pl \
---update-interfaces update pppoe$VAR(../../../@) $VAR(..) $VAR(@)\" "
-
-delete:expression: "sh -c \"echo delete pppoe=[$VAR(../../../@)] dir=[$VAR(..)] name=[$VAR(@)] \
->> /tmp/cli.log && \
-sudo /opt/vyatta/sbin/vyatta-firewall.pl \
---update-interfaces delete pppoe$VAR(../../../@) $VAR(..) $VAR(@)\" "
diff --git a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/firewall/out/node.def b/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/firewall/out/node.def
deleted file mode 100644
index 3aec5f0..0000000
--- a/templates/interfaces/adsl/node.tag/pvc/node.tag/pppoe/node.tag/firewall/out/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Set filter for forwarded packets on outbound interface
diff --git a/templates/interfaces/bonding/node.tag/firewall/in/name/node.def b/templates/interfaces/bonding/node.tag/firewall/in/name/node.def
deleted file mode 100644
index 45ddefa..0000000
--- a/templates/interfaces/bonding/node.tag/firewall/in/name/node.def
+++ /dev/null
@@ -1,18 +0,0 @@
-type: txt
-
-help: Set inbound interface filter name
-
-create:expression: "sh -c \"echo create eth=[$VAR(../../../@)] dir=[$VAR(..)] name=[$VAR(@)] \
->> /tmp/cli.log && \
-sudo /opt/vyatta/sbin/vyatta-firewall.pl \
---update-interfaces update $VAR(../../../@) $VAR(..) $VAR(@)\" "
-
-update:expression: "sh -c \"echo update eth=[$VAR(../../../@)] dir=[$VAR(..)] name=[$VAR(@)] \
->> /tmp/cli.log && \
-sudo /opt/vyatta/sbin/vyatta-firewall.pl \
---update-interfaces update $VAR(../../../@) $VAR(..) $VAR(@)\" "
-
-delete:expression: "sh -c \"echo delete eth=[$VAR(../../../@)] dir=[$VAR(..)] name=[$VAR(@)] \
->> /tmp/cli.log && \
-sudo /opt/vyatta/sbin/vyatta-firewall.pl \
---update-interfaces delete $VAR(../../../@) $VAR(..) $VAR(@)\" "
diff --git a/templates/interfaces/bonding/node.tag/firewall/in/node.def b/templates/interfaces/bonding/node.tag/firewall/in/node.def
deleted file mode 100644
index eccc79b..0000000
--- a/templates/interfaces/bonding/node.tag/firewall/in/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Set filter for forwarded packets on inbound interface
diff --git a/templates/interfaces/bonding/node.tag/firewall/local/name/node.def b/templates/interfaces/bonding/node.tag/firewall/local/name/node.def
deleted file mode 100644
index 2908207..0000000
--- a/templates/interfaces/bonding/node.tag/firewall/local/name/node.def
+++ /dev/null
@@ -1,18 +0,0 @@
-type: txt
-
-help: Set local filter name
-
-create:expression: "sh -c \"echo create eth=[$VAR(../../../@)] dir=[$VAR(..)] name=[$VAR(@)] \
->> /tmp/cli.log && \
-sudo /opt/vyatta/sbin/vyatta-firewall.pl \
---update-interfaces update $VAR(../../../@) $VAR(..) $VAR(@)\" "
-
-update:expression: "sh -c \"echo update eth=[$VAR(../../../@)] dir=[$VAR(..)] name=[$VAR(@)] \
->> /tmp/cli.log && \
-sudo /opt/vyatta/sbin/vyatta-firewall.pl \
---update-interfaces update $VAR(../../../@) $VAR(..) $VAR(@)\" "
-
-delete:expression: "sh -c \"echo delete eth=[$VAR(../../../@)] dir=[$VAR(..)] name=[$VAR(@)] \
->> /tmp/cli.log && \
-sudo /opt/vyatta/sbin/vyatta-firewall.pl \
---update-interfaces delete $VAR(../../../@) $VAR(..) $VAR(@)\" "
diff --git a/templates/interfaces/bonding/node.tag/firewall/local/node.def b/templates/interfaces/bonding/node.tag/firewall/local/node.def
deleted file mode 100644
index 2595835..0000000
--- a/templates/interfaces/bonding/node.tag/firewall/local/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Set filter for packets destined for this router
diff --git a/templates/interfaces/bonding/node.tag/firewall/node.def b/templates/interfaces/bonding/node.tag/firewall/node.def
deleted file mode 100644
index 11748d2..0000000
--- a/templates/interfaces/bonding/node.tag/firewall/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Set firewall options
diff --git a/templates/interfaces/bonding/node.tag/firewall/out/name/node.def b/templates/interfaces/bonding/node.tag/firewall/out/name/node.def
deleted file mode 100644
index 13a7c31..0000000
--- a/templates/interfaces/bonding/node.tag/firewall/out/name/node.def
+++ /dev/null
@@ -1,18 +0,0 @@
-type: txt
-
-help: Set outbound interface filter name
-
-create:expression: "sh -c \"echo create eth=[$VAR(../../../@)] dir=[$VAR(..)] name=[$VAR(@)] \
->> /tmp/cli.log && \
-sudo /opt/vyatta/sbin/vyatta-firewall.pl \
---update-interfaces update $VAR(../../../@) $VAR(..) $VAR(@)\" "
-
-update:expression: "sh -c \"echo update eth=[$VAR(../../../@)] dir=[$VAR(..)] name=[$VAR(@)] \
->> /tmp/cli.log && \
-sudo /opt/vyatta/sbin/vyatta-firewall.pl \
---update-interfaces update $VAR(../../../@) $VAR(..) $VAR(@)\" "
-
-delete:expression: "sh -c \"echo delete eth=[$VAR(../../../@)] dir=[$VAR(..)] name=[$VAR(@)] \
->> /tmp/cli.log && \
-sudo /opt/vyatta/sbin/vyatta-firewall.pl \
---update-interfaces delete $VAR(../../../@) $VAR(..) $VAR(@)\" "
diff --git a/templates/interfaces/bonding/node.tag/firewall/out/node.def b/templates/interfaces/bonding/node.tag/firewall/out/node.def
deleted file mode 100644
index 3aec5f0..0000000
--- a/templates/interfaces/bonding/node.tag/firewall/out/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Set filter for forwarded packets on outbound interface
diff --git a/templates/interfaces/bonding/node.tag/vif/node.tag/firewall/in/name/node.def b/templates/interfaces/bonding/node.tag/vif/node.tag/firewall/in/name/node.def
deleted file mode 100644
index f69297a..0000000
--- a/templates/interfaces/bonding/node.tag/vif/node.tag/firewall/in/name/node.def
+++ /dev/null
@@ -1,18 +0,0 @@
-type: txt
-
-help: Set inbound interface filter name
-
-create:expression: "sh -c \"echo create eth=[$VAR(../../../../@)] vif=[$VAR(../../../@)] \
-dir=[$VAR(..)] name=[$VAR(@)] >> /tmp/cli.log && \
-sudo /opt/vyatta/sbin/vyatta-firewall.pl \
---update-interfaces update $VAR(../../../../@).$VAR(../../../@) $VAR(..) $VAR(@)\" "
-
-update:expression: "sh -c \"echo update eth=[$VAR(../../../../@)] vif=[$VAR(../../../@)] \
-dir=[$VAR(..)] name=[$VAR(@)] >> /tmp/cli.log && \
-sudo /opt/vyatta/sbin/vyatta-firewall.pl \
---update-interfaces update $VAR(../../../../@).$VAR(../../../@) $VAR(..) $VAR(@)\" "
-
-delete:expression: "sh -c \"echo delete eth=[$VAR(../../../../@)] vif=[$VAR(../../../@)] \
-dir=[$VAR(..)] name=[$VAR(@)] >> /tmp/cli.log && \
-sudo /opt/vyatta/sbin/vyatta-firewall.pl \
---update-interfaces delete $VAR(../../../../@).$VAR(../../../@) $VAR(..) $VAR(@)\" "
diff --git a/templates/interfaces/bonding/node.tag/vif/node.tag/firewall/in/node.def b/templates/interfaces/bonding/node.tag/vif/node.tag/firewall/in/node.def
deleted file mode 100644
index eccc79b..0000000
--- a/templates/interfaces/bonding/node.tag/vif/node.tag/firewall/in/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Set filter for forwarded packets on inbound interface
diff --git a/templates/interfaces/bonding/node.tag/vif/node.tag/firewall/local/name/node.def b/templates/interfaces/bonding/node.tag/vif/node.tag/firewall/local/name/node.def
deleted file mode 100644
index 7ed2aa7..0000000
--- a/templates/interfaces/bonding/node.tag/vif/node.tag/firewall/local/name/node.def
+++ /dev/null
@@ -1,17 +0,0 @@
-type: txt
-
-help: Set local filter name
-
-create:expression: "sh -c \"echo create eth=[$VAR(../../../../@)] vif=[$VAR(../../../@)] \        dir=[$VAR(..)] name=[$VAR(@)] >> /tmp/cli.log && \
-sudo /opt/vyatta/sbin/vyatta-firewall.pl \
---update-interfaces update $VAR(../../../../@).$VAR(../../../@) $VAR(..) $VAR(@)\" "
-
-update:expression: "sh -c \"echo update eth=[$VAR(../../../../@)] vif=[$VAR(../../../@)] \
-dir=[$VAR(..)] name=[$VAR(@)] >> /tmp/cli.log && \
-sudo /opt/vyatta/sbin/vyatta-firewall.pl \
---update-interfaces update $VAR(../../../../@).$VAR(../../../@) $VAR(..) $VAR(@)\" "
-
-delete:expression: "sh -c \"echo delete eth=[$VAR(../../../../@)] vif=[$VAR(../../../@)] \
-dir=[$VAR(..)] name=[$VAR(@)] >> /tmp/cli.log && \
-sudo /opt/vyatta/sbin/vyatta-firewall.pl \
---update-interfaces delete $VAR(../../../../@).$VAR(../../../@) $VAR(..) $VAR(@)\" "
diff --git a/templates/interfaces/bonding/node.tag/vif/node.tag/firewall/local/node.def b/templates/interfaces/bonding/node.tag/vif/node.tag/firewall/local/node.def
deleted file mode 100644
index 2656a94..0000000
--- a/templates/interfaces/bonding/node.tag/vif/node.tag/firewall/local/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Set filter packets destined for this router
diff --git a/templates/interfaces/bonding/node.tag/vif/node.tag/firewall/node.def b/templates/interfaces/bonding/node.tag/vif/node.tag/firewall/node.def
deleted file mode 100644
index 11748d2..0000000
--- a/templates/interfaces/bonding/node.tag/vif/node.tag/firewall/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Set firewall options
diff --git a/templates/interfaces/bonding/node.tag/vif/node.tag/firewall/out/name/node.def b/templates/interfaces/bonding/node.tag/vif/node.tag/firewall/out/name/node.def
deleted file mode 100644
index 82a0f0b..0000000
--- a/templates/interfaces/bonding/node.tag/vif/node.tag/firewall/out/name/node.def
+++ /dev/null
@@ -1,17 +0,0 @@
-type: txt
-
-help: Set outbound interface filter name
-
-create:expression: "sh -c \"echo create eth=[$VAR(../../../../@)] vif=[$VAR(../../../@)] \        dir=[$VAR(..)] name=[$VAR(@)] >> /tmp/cli.log && \
-sudo /opt/vyatta/sbin/vyatta-firewall.pl \
---update-interfaces update $VAR(../../../../@).$VAR(../../../@) $VAR(..) $VAR(@)\" "
-
-update:expression: "sh -c \"echo update eth=[$VAR(../../../../@)] vif=[$VAR(../../../@)] \
-dir=[$VAR(..)] name=[$VAR(@)] >> /tmp/cli.log && \
-sudo /opt/vyatta/sbin/vyatta-firewall.pl \
---update-interfaces update $VAR(../../../../@).$VAR(../../../@) $VAR(..) $VAR(@)\" "
-
-delete:expression: "sh -c \"echo delete eth=[$VAR(../../../../@)] vif=[$VAR(../../../@)] \
-dir=[$VAR(..)] name=[$VAR(@)] >> /tmp/cli.log && \
-sudo /opt/vyatta/sbin/vyatta-firewall.pl \
---update-interfaces delete $VAR(../../../../@).$VAR(../../../@) $VAR(..) $VAR(@)\" "
diff --git a/templates/interfaces/bonding/node.tag/vif/node.tag/firewall/out/node.def b/templates/interfaces/bonding/node.tag/vif/node.tag/firewall/out/node.def
deleted file mode 100644
index a3de8f5..0000000
--- a/templates/interfaces/bonding/node.tag/vif/node.tag/firewall/out/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Set filter forwarded packets on outbound interface
diff --git a/templates/interfaces/ethernet/node.tag/firewall/in/name/node.def b/templates/interfaces/ethernet/node.tag/firewall/in/name/node.def
deleted file mode 100644
index 45ddefa..0000000
--- a/templates/interfaces/ethernet/node.tag/firewall/in/name/node.def
+++ /dev/null
@@ -1,18 +0,0 @@
-type: txt
-
-help: Set inbound interface filter name
-
-create:expression: "sh -c \"echo create eth=[$VAR(../../../@)] dir=[$VAR(..)] name=[$VAR(@)] \
->> /tmp/cli.log && \
-sudo /opt/vyatta/sbin/vyatta-firewall.pl \
---update-interfaces update $VAR(../../../@) $VAR(..) $VAR(@)\" "
-
-update:expression: "sh -c \"echo update eth=[$VAR(../../../@)] dir=[$VAR(..)] name=[$VAR(@)] \
->> /tmp/cli.log && \
-sudo /opt/vyatta/sbin/vyatta-firewall.pl \
---update-interfaces update $VAR(../../../@) $VAR(..) $VAR(@)\" "
-
-delete:expression: "sh -c \"echo delete eth=[$VAR(../../../@)] dir=[$VAR(..)] name=[$VAR(@)] \
->> /tmp/cli.log && \
-sudo /opt/vyatta/sbin/vyatta-firewall.pl \
---update-interfaces delete $VAR(../../../@) $VAR(..) $VAR(@)\" "
diff --git a/templates/interfaces/ethernet/node.tag/firewall/in/node.def b/templates/interfaces/ethernet/node.tag/firewall/in/node.def
deleted file mode 100644
index eccc79b..0000000
--- a/templates/interfaces/ethernet/node.tag/firewall/in/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Set filter for forwarded packets on inbound interface
diff --git a/templates/interfaces/ethernet/node.tag/firewall/local/name/node.def b/templates/interfaces/ethernet/node.tag/firewall/local/name/node.def
deleted file mode 100644
index 2908207..0000000
--- a/templates/interfaces/ethernet/node.tag/firewall/local/name/node.def
+++ /dev/null
@@ -1,18 +0,0 @@
-type: txt
-
-help: Set local filter name
-
-create:expression: "sh -c \"echo create eth=[$VAR(../../../@)] dir=[$VAR(..)] name=[$VAR(@)] \
->> /tmp/cli.log && \
-sudo /opt/vyatta/sbin/vyatta-firewall.pl \
---update-interfaces update $VAR(../../../@) $VAR(..) $VAR(@)\" "
-
-update:expression: "sh -c \"echo update eth=[$VAR(../../../@)] dir=[$VAR(..)] name=[$VAR(@)] \
->> /tmp/cli.log && \
-sudo /opt/vyatta/sbin/vyatta-firewall.pl \
---update-interfaces update $VAR(../../../@) $VAR(..) $VAR(@)\" "
-
-delete:expression: "sh -c \"echo delete eth=[$VAR(../../../@)] dir=[$VAR(..)] name=[$VAR(@)] \
->> /tmp/cli.log && \
-sudo /opt/vyatta/sbin/vyatta-firewall.pl \
---update-interfaces delete $VAR(../../../@) $VAR(..) $VAR(@)\" "
diff --git a/templates/interfaces/ethernet/node.tag/firewall/local/node.def b/templates/interfaces/ethernet/node.tag/firewall/local/node.def
deleted file mode 100644
index 2595835..0000000
--- a/templates/interfaces/ethernet/node.tag/firewall/local/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Set filter for packets destined for this router
diff --git a/templates/interfaces/ethernet/node.tag/firewall/node.def b/templates/interfaces/ethernet/node.tag/firewall/node.def
deleted file mode 100644
index 11748d2..0000000
--- a/templates/interfaces/ethernet/node.tag/firewall/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Set firewall options
diff --git a/templates/interfaces/ethernet/node.tag/firewall/out/name/node.def b/templates/interfaces/ethernet/node.tag/firewall/out/name/node.def
deleted file mode 100644
index 13a7c31..0000000
--- a/templates/interfaces/ethernet/node.tag/firewall/out/name/node.def
+++ /dev/null
@@ -1,18 +0,0 @@
-type: txt
-
-help: Set outbound interface filter name
-
-create:expression: "sh -c \"echo create eth=[$VAR(../../../@)] dir=[$VAR(..)] name=[$VAR(@)] \
->> /tmp/cli.log && \
-sudo /opt/vyatta/sbin/vyatta-firewall.pl \
---update-interfaces update $VAR(../../../@) $VAR(..) $VAR(@)\" "
-
-update:expression: "sh -c \"echo update eth=[$VAR(../../../@)] dir=[$VAR(..)] name=[$VAR(@)] \
->> /tmp/cli.log && \
-sudo /opt/vyatta/sbin/vyatta-firewall.pl \
---update-interfaces update $VAR(../../../@) $VAR(..) $VAR(@)\" "
-
-delete:expression: "sh -c \"echo delete eth=[$VAR(../../../@)] dir=[$VAR(..)] name=[$VAR(@)] \
->> /tmp/cli.log && \
-sudo /opt/vyatta/sbin/vyatta-firewall.pl \
---update-interfaces delete $VAR(../../../@) $VAR(..) $VAR(@)\" "
diff --git a/templates/interfaces/ethernet/node.tag/firewall/out/node.def b/templates/interfaces/ethernet/node.tag/firewall/out/node.def
deleted file mode 100644
index 3aec5f0..0000000
--- a/templates/interfaces/ethernet/node.tag/firewall/out/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Set filter for forwarded packets on outbound interface
diff --git a/templates/interfaces/ethernet/node.tag/pppoe/node.tag/firewall/in/name/node.def b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/firewall/in/name/node.def
deleted file mode 100644
index 6e629bc..0000000
--- a/templates/interfaces/ethernet/node.tag/pppoe/node.tag/firewall/in/name/node.def
+++ /dev/null
@@ -1,18 +0,0 @@
-type: txt
-
-help: Set inbound interface filter name
-
-create:expression: "sh -c \"echo create pppoe=[$VAR(../../../@)] dir=[$VAR(..)] name=[$VAR(@)] \
->> /tmp/cli.log && \
-sudo /opt/vyatta/sbin/vyatta-firewall.pl \
---update-interfaces update pppoe$VAR(../../../@) $VAR(..) $VAR(@)\" "
-
-update:expression: "sh -c \"echo update pppoe=[$VAR(../../../@)] dir=[$VAR(..)] name=[$VAR(@)] \
->> /tmp/cli.log && \
-sudo /opt/vyatta/sbin/vyatta-firewall.pl \
---update-interfaces update pppoe$VAR(../../../@) $VAR(..) $VAR(@)\" "
-
-delete:expression: "sh -c \"echo delete pppoe=[$VAR(../../../@)] dir=[$VAR(..)] name=[$VAR(@)] \
->> /tmp/cli.log && \
-sudo /opt/vyatta/sbin/vyatta-firewall.pl \
---update-interfaces delete pppoe$VAR(../../../@) $VAR(..) $VAR(@)\" "
diff --git a/templates/interfaces/ethernet/node.tag/pppoe/node.tag/firewall/in/node.def b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/firewall/in/node.def
deleted file mode 100644
index eccc79b..0000000
--- a/templates/interfaces/ethernet/node.tag/pppoe/node.tag/firewall/in/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Set filter for forwarded packets on inbound interface
diff --git a/templates/interfaces/ethernet/node.tag/pppoe/node.tag/firewall/local/name/node.def b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/firewall/local/name/node.def
deleted file mode 100644
index 44e85d1..0000000
--- a/templates/interfaces/ethernet/node.tag/pppoe/node.tag/firewall/local/name/node.def
+++ /dev/null
@@ -1,18 +0,0 @@
-type: txt
-
-help: Set local filter name
-
-create:expression: "sh -c \"echo create pppoe=[$VAR(../../../@)] dir=[$VAR(..)] name=[$VAR(@)] \
->> /tmp/cli.log && \
-sudo /opt/vyatta/sbin/vyatta-firewall.pl \
---update-interfaces update pppoe$VAR(../../../@) $VAR(..) $VAR(@)\" "
-
-update:expression: "sh -c \"echo update pppoe=[$VAR(../../../@)] dir=[$VAR(..)] name=[$VAR(@)] \
->> /tmp/cli.log && \
-sudo /opt/vyatta/sbin/vyatta-firewall.pl \
---update-interfaces update pppoe$VAR(../../../@) $VAR(..) $VAR(@)\" "
-
-delete:expression: "sh -c \"echo delete pppoe=[$VAR(../../../@)] dir=[$VAR(..)] name=[$VAR(@)] \
->> /tmp/cli.log && \
-sudo /opt/vyatta/sbin/vyatta-firewall.pl \
---update-interfaces delete pppoe$VAR(../../../@) $VAR(..) $VAR(@)\" "
diff --git a/templates/interfaces/ethernet/node.tag/pppoe/node.tag/firewall/local/node.def b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/firewall/local/node.def
deleted file mode 100644
index 2595835..0000000
--- a/templates/interfaces/ethernet/node.tag/pppoe/node.tag/firewall/local/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Set filter for packets destined for this router
diff --git a/templates/interfaces/ethernet/node.tag/pppoe/node.tag/firewall/node.def b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/firewall/node.def
deleted file mode 100644
index 11748d2..0000000
--- a/templates/interfaces/ethernet/node.tag/pppoe/node.tag/firewall/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Set firewall options
diff --git a/templates/interfaces/ethernet/node.tag/pppoe/node.tag/firewall/out/name/node.def b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/firewall/out/name/node.def
deleted file mode 100644
index 2c37224..0000000
--- a/templates/interfaces/ethernet/node.tag/pppoe/node.tag/firewall/out/name/node.def
+++ /dev/null
@@ -1,18 +0,0 @@
-type: txt
-
-help: Set outbound interface filter name
-
-create:expression: "sh -c \"echo create pppoe=[$VAR(../../../@)] dir=[$VAR(..)] name=[$VAR(@)] \
->> /tmp/cli.log && \
-sudo /opt/vyatta/sbin/vyatta-firewall.pl \
---update-interfaces update pppoe$VAR(../../../@) $VAR(..) $VAR(@)\" "
-
-update:expression: "sh -c \"echo update pppoe=[$VAR(../../../@)] dir=[$VAR(..)] name=[$VAR(@)] \
->> /tmp/cli.log && \
-sudo /opt/vyatta/sbin/vyatta-firewall.pl \
---update-interfaces update pppoe$VAR(../../../@) $VAR(..) $VAR(@)\" "
-
-delete:expression: "sh -c \"echo delete pppoe=[$VAR(../../../@)] dir=[$VAR(..)] name=[$VAR(@)] \
->> /tmp/cli.log && \
-sudo /opt/vyatta/sbin/vyatta-firewall.pl \
---update-interfaces delete pppoe$VAR(../../../@) $VAR(..) $VAR(@)\" "
diff --git a/templates/interfaces/ethernet/node.tag/pppoe/node.tag/firewall/out/node.def b/templates/interfaces/ethernet/node.tag/pppoe/node.tag/firewall/out/node.def
deleted file mode 100644
index 3aec5f0..0000000
--- a/templates/interfaces/ethernet/node.tag/pppoe/node.tag/firewall/out/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Set filter for forwarded packets on outbound interface
diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/firewall/in/name/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/firewall/in/name/node.def
deleted file mode 100644
index f69297a..0000000
--- a/templates/interfaces/ethernet/node.tag/vif/node.tag/firewall/in/name/node.def
+++ /dev/null
@@ -1,18 +0,0 @@
-type: txt
-
-help: Set inbound interface filter name
-
-create:expression: "sh -c \"echo create eth=[$VAR(../../../../@)] vif=[$VAR(../../../@)] \
-dir=[$VAR(..)] name=[$VAR(@)] >> /tmp/cli.log && \
-sudo /opt/vyatta/sbin/vyatta-firewall.pl \
---update-interfaces update $VAR(../../../../@).$VAR(../../../@) $VAR(..) $VAR(@)\" "
-
-update:expression: "sh -c \"echo update eth=[$VAR(../../../../@)] vif=[$VAR(../../../@)] \
-dir=[$VAR(..)] name=[$VAR(@)] >> /tmp/cli.log && \
-sudo /opt/vyatta/sbin/vyatta-firewall.pl \
---update-interfaces update $VAR(../../../../@).$VAR(../../../@) $VAR(..) $VAR(@)\" "
-
-delete:expression: "sh -c \"echo delete eth=[$VAR(../../../../@)] vif=[$VAR(../../../@)] \
-dir=[$VAR(..)] name=[$VAR(@)] >> /tmp/cli.log && \
-sudo /opt/vyatta/sbin/vyatta-firewall.pl \
---update-interfaces delete $VAR(../../../../@).$VAR(../../../@) $VAR(..) $VAR(@)\" "
diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/firewall/in/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/firewall/in/node.def
deleted file mode 100644
index eccc79b..0000000
--- a/templates/interfaces/ethernet/node.tag/vif/node.tag/firewall/in/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Set filter for forwarded packets on inbound interface
diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/firewall/local/name/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/firewall/local/name/node.def
deleted file mode 100644
index 7ed2aa7..0000000
--- a/templates/interfaces/ethernet/node.tag/vif/node.tag/firewall/local/name/node.def
+++ /dev/null
@@ -1,17 +0,0 @@
-type: txt
-
-help: Set local filter name
-
-create:expression: "sh -c \"echo create eth=[$VAR(../../../../@)] vif=[$VAR(../../../@)] \        dir=[$VAR(..)] name=[$VAR(@)] >> /tmp/cli.log && \
-sudo /opt/vyatta/sbin/vyatta-firewall.pl \
---update-interfaces update $VAR(../../../../@).$VAR(../../../@) $VAR(..) $VAR(@)\" "
-
-update:expression: "sh -c \"echo update eth=[$VAR(../../../../@)] vif=[$VAR(../../../@)] \
-dir=[$VAR(..)] name=[$VAR(@)] >> /tmp/cli.log && \
-sudo /opt/vyatta/sbin/vyatta-firewall.pl \
---update-interfaces update $VAR(../../../../@).$VAR(../../../@) $VAR(..) $VAR(@)\" "
-
-delete:expression: "sh -c \"echo delete eth=[$VAR(../../../../@)] vif=[$VAR(../../../@)] \
-dir=[$VAR(..)] name=[$VAR(@)] >> /tmp/cli.log && \
-sudo /opt/vyatta/sbin/vyatta-firewall.pl \
---update-interfaces delete $VAR(../../../../@).$VAR(../../../@) $VAR(..) $VAR(@)\" "
diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/firewall/local/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/firewall/local/node.def
deleted file mode 100644
index 2656a94..0000000
--- a/templates/interfaces/ethernet/node.tag/vif/node.tag/firewall/local/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Set filter packets destined for this router
diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/firewall/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/firewall/node.def
deleted file mode 100644
index 11748d2..0000000
--- a/templates/interfaces/ethernet/node.tag/vif/node.tag/firewall/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Set firewall options
diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/firewall/out/name/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/firewall/out/name/node.def
deleted file mode 100644
index 82a0f0b..0000000
--- a/templates/interfaces/ethernet/node.tag/vif/node.tag/firewall/out/name/node.def
+++ /dev/null
@@ -1,17 +0,0 @@
-type: txt
-
-help: Set outbound interface filter name
-
-create:expression: "sh -c \"echo create eth=[$VAR(../../../../@)] vif=[$VAR(../../../@)] \        dir=[$VAR(..)] name=[$VAR(@)] >> /tmp/cli.log && \
-sudo /opt/vyatta/sbin/vyatta-firewall.pl \
---update-interfaces update $VAR(../../../../@).$VAR(../../../@) $VAR(..) $VAR(@)\" "
-
-update:expression: "sh -c \"echo update eth=[$VAR(../../../../@)] vif=[$VAR(../../../@)] \
-dir=[$VAR(..)] name=[$VAR(@)] >> /tmp/cli.log && \
-sudo /opt/vyatta/sbin/vyatta-firewall.pl \
---update-interfaces update $VAR(../../../../@).$VAR(../../../@) $VAR(..) $VAR(@)\" "
-
-delete:expression: "sh -c \"echo delete eth=[$VAR(../../../../@)] vif=[$VAR(../../../@)] \
-dir=[$VAR(..)] name=[$VAR(@)] >> /tmp/cli.log && \
-sudo /opt/vyatta/sbin/vyatta-firewall.pl \
---update-interfaces delete $VAR(../../../../@).$VAR(../../../@) $VAR(..) $VAR(@)\" "
diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/firewall/out/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/firewall/out/node.def
deleted file mode 100644
index a3de8f5..0000000
--- a/templates/interfaces/ethernet/node.tag/vif/node.tag/firewall/out/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Set filter forwarded packets on outbound interface
diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/pppoe/node.tag/firewall/in/name/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/pppoe/node.tag/firewall/in/name/node.def
deleted file mode 100644
index 6e629bc..0000000
--- a/templates/interfaces/ethernet/node.tag/vif/node.tag/pppoe/node.tag/firewall/in/name/node.def
+++ /dev/null
@@ -1,18 +0,0 @@
-type: txt
-
-help: Set inbound interface filter name
-
-create:expression: "sh -c \"echo create pppoe=[$VAR(../../../@)] dir=[$VAR(..)] name=[$VAR(@)] \
->> /tmp/cli.log && \
-sudo /opt/vyatta/sbin/vyatta-firewall.pl \
---update-interfaces update pppoe$VAR(../../../@) $VAR(..) $VAR(@)\" "
-
-update:expression: "sh -c \"echo update pppoe=[$VAR(../../../@)] dir=[$VAR(..)] name=[$VAR(@)] \
->> /tmp/cli.log && \
-sudo /opt/vyatta/sbin/vyatta-firewall.pl \
---update-interfaces update pppoe$VAR(../../../@) $VAR(..) $VAR(@)\" "
-
-delete:expression: "sh -c \"echo delete pppoe=[$VAR(../../../@)] dir=[$VAR(..)] name=[$VAR(@)] \
->> /tmp/cli.log && \
-sudo /opt/vyatta/sbin/vyatta-firewall.pl \
---update-interfaces delete pppoe$VAR(../../../@) $VAR(..) $VAR(@)\" "
diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/pppoe/node.tag/firewall/in/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/pppoe/node.tag/firewall/in/node.def
deleted file mode 100644
index eccc79b..0000000
--- a/templates/interfaces/ethernet/node.tag/vif/node.tag/pppoe/node.tag/firewall/in/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Set filter for forwarded packets on inbound interface
diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/pppoe/node.tag/firewall/local/name/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/pppoe/node.tag/firewall/local/name/node.def
deleted file mode 100644
index 44e85d1..0000000
--- a/templates/interfaces/ethernet/node.tag/vif/node.tag/pppoe/node.tag/firewall/local/name/node.def
+++ /dev/null
@@ -1,18 +0,0 @@
-type: txt
-
-help: Set local filter name
-
-create:expression: "sh -c \"echo create pppoe=[$VAR(../../../@)] dir=[$VAR(..)] name=[$VAR(@)] \
->> /tmp/cli.log && \
-sudo /opt/vyatta/sbin/vyatta-firewall.pl \
---update-interfaces update pppoe$VAR(../../../@) $VAR(..) $VAR(@)\" "
-
-update:expression: "sh -c \"echo update pppoe=[$VAR(../../../@)] dir=[$VAR(..)] name=[$VAR(@)] \
->> /tmp/cli.log && \
-sudo /opt/vyatta/sbin/vyatta-firewall.pl \
---update-interfaces update pppoe$VAR(../../../@) $VAR(..) $VAR(@)\" "
-
-delete:expression: "sh -c \"echo delete pppoe=[$VAR(../../../@)] dir=[$VAR(..)] name=[$VAR(@)] \
->> /tmp/cli.log && \
-sudo /opt/vyatta/sbin/vyatta-firewall.pl \
---update-interfaces delete pppoe$VAR(../../../@) $VAR(..) $VAR(@)\" "
diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/pppoe/node.tag/firewall/local/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/pppoe/node.tag/firewall/local/node.def
deleted file mode 100644
index 2595835..0000000
--- a/templates/interfaces/ethernet/node.tag/vif/node.tag/pppoe/node.tag/firewall/local/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Set filter for packets destined for this router
diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/pppoe/node.tag/firewall/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/pppoe/node.tag/firewall/node.def
deleted file mode 100644
index 11748d2..0000000
--- a/templates/interfaces/ethernet/node.tag/vif/node.tag/pppoe/node.tag/firewall/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Set firewall options
diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/pppoe/node.tag/firewall/out/name/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/pppoe/node.tag/firewall/out/name/node.def
deleted file mode 100644
index 2c37224..0000000
--- a/templates/interfaces/ethernet/node.tag/vif/node.tag/pppoe/node.tag/firewall/out/name/node.def
+++ /dev/null
@@ -1,18 +0,0 @@
-type: txt
-
-help: Set outbound interface filter name
-
-create:expression: "sh -c \"echo create pppoe=[$VAR(../../../@)] dir=[$VAR(..)] name=[$VAR(@)] \
->> /tmp/cli.log && \
-sudo /opt/vyatta/sbin/vyatta-firewall.pl \
---update-interfaces update pppoe$VAR(../../../@) $VAR(..) $VAR(@)\" "
-
-update:expression: "sh -c \"echo update pppoe=[$VAR(../../../@)] dir=[$VAR(..)] name=[$VAR(@)] \
->> /tmp/cli.log && \
-sudo /opt/vyatta/sbin/vyatta-firewall.pl \
---update-interfaces update pppoe$VAR(../../../@) $VAR(..) $VAR(@)\" "
-
-delete:expression: "sh -c \"echo delete pppoe=[$VAR(../../../@)] dir=[$VAR(..)] name=[$VAR(@)] \
->> /tmp/cli.log && \
-sudo /opt/vyatta/sbin/vyatta-firewall.pl \
---update-interfaces delete pppoe$VAR(../../../@) $VAR(..) $VAR(@)\" "
diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/pppoe/node.tag/firewall/out/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/pppoe/node.tag/firewall/out/node.def
deleted file mode 100644
index 3aec5f0..0000000
--- a/templates/interfaces/ethernet/node.tag/vif/node.tag/pppoe/node.tag/firewall/out/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Set filter for forwarded packets on outbound interface
diff --git a/templates/interfaces/tunnel/node.tag/firewall/in/name/node.def b/templates/interfaces/tunnel/node.tag/firewall/in/name/node.def
deleted file mode 100644
index 45ddefa..0000000
--- a/templates/interfaces/tunnel/node.tag/firewall/in/name/node.def
+++ /dev/null
@@ -1,18 +0,0 @@
-type: txt
-
-help: Set inbound interface filter name
-
-create:expression: "sh -c \"echo create eth=[$VAR(../../../@)] dir=[$VAR(..)] name=[$VAR(@)] \
->> /tmp/cli.log && \
-sudo /opt/vyatta/sbin/vyatta-firewall.pl \
---update-interfaces update $VAR(../../../@) $VAR(..) $VAR(@)\" "
-
-update:expression: "sh -c \"echo update eth=[$VAR(../../../@)] dir=[$VAR(..)] name=[$VAR(@)] \
->> /tmp/cli.log && \
-sudo /opt/vyatta/sbin/vyatta-firewall.pl \
---update-interfaces update $VAR(../../../@) $VAR(..) $VAR(@)\" "
-
-delete:expression: "sh -c \"echo delete eth=[$VAR(../../../@)] dir=[$VAR(..)] name=[$VAR(@)] \
->> /tmp/cli.log && \
-sudo /opt/vyatta/sbin/vyatta-firewall.pl \
---update-interfaces delete $VAR(../../../@) $VAR(..) $VAR(@)\" "
diff --git a/templates/interfaces/tunnel/node.tag/firewall/in/node.def b/templates/interfaces/tunnel/node.tag/firewall/in/node.def
deleted file mode 100644
index eccc79b..0000000
--- a/templates/interfaces/tunnel/node.tag/firewall/in/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Set filter for forwarded packets on inbound interface
diff --git a/templates/interfaces/tunnel/node.tag/firewall/local/name/node.def b/templates/interfaces/tunnel/node.tag/firewall/local/name/node.def
deleted file mode 100644
index 2908207..0000000
--- a/templates/interfaces/tunnel/node.tag/firewall/local/name/node.def
+++ /dev/null
@@ -1,18 +0,0 @@
-type: txt
-
-help: Set local filter name
-
-create:expression: "sh -c \"echo create eth=[$VAR(../../../@)] dir=[$VAR(..)] name=[$VAR(@)] \
->> /tmp/cli.log && \
-sudo /opt/vyatta/sbin/vyatta-firewall.pl \
---update-interfaces update $VAR(../../../@) $VAR(..) $VAR(@)\" "
-
-update:expression: "sh -c \"echo update eth=[$VAR(../../../@)] dir=[$VAR(..)] name=[$VAR(@)] \
->> /tmp/cli.log && \
-sudo /opt/vyatta/sbin/vyatta-firewall.pl \
---update-interfaces update $VAR(../../../@) $VAR(..) $VAR(@)\" "
-
-delete:expression: "sh -c \"echo delete eth=[$VAR(../../../@)] dir=[$VAR(..)] name=[$VAR(@)] \
->> /tmp/cli.log && \
-sudo /opt/vyatta/sbin/vyatta-firewall.pl \
---update-interfaces delete $VAR(../../../@) $VAR(..) $VAR(@)\" "
diff --git a/templates/interfaces/tunnel/node.tag/firewall/local/node.def b/templates/interfaces/tunnel/node.tag/firewall/local/node.def
deleted file mode 100644
index 2595835..0000000
--- a/templates/interfaces/tunnel/node.tag/firewall/local/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Set filter for packets destined for this router
diff --git a/templates/interfaces/tunnel/node.tag/firewall/node.def b/templates/interfaces/tunnel/node.tag/firewall/node.def
deleted file mode 100644
index 11748d2..0000000
--- a/templates/interfaces/tunnel/node.tag/firewall/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Set firewall options
diff --git a/templates/interfaces/tunnel/node.tag/firewall/out/name/node.def b/templates/interfaces/tunnel/node.tag/firewall/out/name/node.def
deleted file mode 100644
index 13a7c31..0000000
--- a/templates/interfaces/tunnel/node.tag/firewall/out/name/node.def
+++ /dev/null
@@ -1,18 +0,0 @@
-type: txt
-
-help: Set outbound interface filter name
-
-create:expression: "sh -c \"echo create eth=[$VAR(../../../@)] dir=[$VAR(..)] name=[$VAR(@)] \
->> /tmp/cli.log && \
-sudo /opt/vyatta/sbin/vyatta-firewall.pl \
---update-interfaces update $VAR(../../../@) $VAR(..) $VAR(@)\" "
-
-update:expression: "sh -c \"echo update eth=[$VAR(../../../@)] dir=[$VAR(..)] name=[$VAR(@)] \
->> /tmp/cli.log && \
-sudo /opt/vyatta/sbin/vyatta-firewall.pl \
---update-interfaces update $VAR(../../../@) $VAR(..) $VAR(@)\" "
-
-delete:expression: "sh -c \"echo delete eth=[$VAR(../../../@)] dir=[$VAR(..)] name=[$VAR(@)] \
->> /tmp/cli.log && \
-sudo /opt/vyatta/sbin/vyatta-firewall.pl \
---update-interfaces delete $VAR(../../../@) $VAR(..) $VAR(@)\" "
diff --git a/templates/interfaces/tunnel/node.tag/firewall/out/node.def b/templates/interfaces/tunnel/node.tag/firewall/out/node.def
deleted file mode 100644
index 3aec5f0..0000000
--- a/templates/interfaces/tunnel/node.tag/firewall/out/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Set filter for forwarded packets on outbound interface