diff options
| author | An-Cheng Huang <ancheng@vyatta.com> | 2010-08-17 18:23:44 -0700 |
|---|---|---|
| committer | An-Cheng Huang <ancheng@vyatta.com> | 2010-08-17 18:23:44 -0700 |
| commit | 099da6eafbdff7b6337a1e3e4c2661c85bfebaac (patch) | |
| tree | 18b5b8fb4d0abb946e7c3c258678d69dfe6bc46e | |
| parent | 1aa5c6660dea6c18adb022f981dc26c3fa98866d (diff) | |
| download | vyatta-cfg-firewall-099da6eafbdff7b6337a1e3e4c2661c85bfebaac.tar.gz vyatta-cfg-firewall-099da6eafbdff7b6337a1e3e4c2661c85bfebaac.zip | |
remove low-level config dir usage
12 files changed, 12 insertions, 36 deletions
diff --git a/templates/firewall/modify/node.tag/rule/node.tag/destination/group/address-group/node.def b/templates/firewall/modify/node.tag/rule/node.tag/destination/group/address-group/node.def index b768dee..07e791c 100644 --- a/templates/firewall/modify/node.tag/rule/node.tag/destination/group/address-group/node.def +++ b/templates/firewall/modify/node.tag/rule/node.tag/destination/group/address-group/node.def @@ -6,6 +6,4 @@ commit:expression: exec "sudo /opt/vyatta/sbin/vyatta-ipset.pl \ --set-name=$VAR(@) \ --set-type=address;" -allowed: local -a array - array=( /opt/vyatta/config/active/firewall/group/address-group/* ) - echo -n ${array[@]##*/} +allowed: cli-shell-api listActiveNodes firewall group address-group diff --git a/templates/firewall/modify/node.tag/rule/node.tag/destination/group/network-group/node.def b/templates/firewall/modify/node.tag/rule/node.tag/destination/group/network-group/node.def index 77a8e81..bf018a0 100644 --- a/templates/firewall/modify/node.tag/rule/node.tag/destination/group/network-group/node.def +++ b/templates/firewall/modify/node.tag/rule/node.tag/destination/group/network-group/node.def @@ -5,6 +5,4 @@ commit:expression: exec "sudo /opt/vyatta/sbin/vyatta-ipset.pl \ --action=check-set-type \ --set-name=$VAR(@) \ --set-type=network;" -allowed: local -a array - array=( /opt/vyatta/config/active/firewall/group/network-group/* ) - echo -n ${array[@]##*/} +allowed: cli-shell-api listActiveNodes firewall group network-group diff --git a/templates/firewall/modify/node.tag/rule/node.tag/destination/group/port-group/node.def b/templates/firewall/modify/node.tag/rule/node.tag/destination/group/port-group/node.def index f6a6844..865d2c5 100644 --- a/templates/firewall/modify/node.tag/rule/node.tag/destination/group/port-group/node.def +++ b/templates/firewall/modify/node.tag/rule/node.tag/destination/group/port-group/node.def @@ -5,6 +5,4 @@ commit:expression: exec "sudo /opt/vyatta/sbin/vyatta-ipset.pl \ --action=check-set-type \ --set-name=$VAR(@) \ --set-type=port;" -allowed: local -a array - array=( /opt/vyatta/config/active/firewall/group/port-group/* ) - echo -n ${array[@]##*/} +allowed: cli-shell-api listActiveNodes firewall group port-group diff --git a/templates/firewall/modify/node.tag/rule/node.tag/source/group/address-group/node.def b/templates/firewall/modify/node.tag/rule/node.tag/source/group/address-group/node.def index d70ba0f..97c748d 100644 --- a/templates/firewall/modify/node.tag/rule/node.tag/source/group/address-group/node.def +++ b/templates/firewall/modify/node.tag/rule/node.tag/source/group/address-group/node.def @@ -5,6 +5,4 @@ commit:expression: exec "sudo /opt/vyatta/sbin/vyatta-ipset.pl \ --action=check-set-type \ --set-name=$VAR(@) \ --set-type=address;" -allowed: local -a array - array=( /opt/vyatta/config/active/firewall/group/address-group/* ) - echo -n ${array[@]##*/} +allowed: cli-shell-api listActiveNodes firewall group address-group diff --git a/templates/firewall/modify/node.tag/rule/node.tag/source/group/network-group/node.def b/templates/firewall/modify/node.tag/rule/node.tag/source/group/network-group/node.def index 77a8e81..bf018a0 100644 --- a/templates/firewall/modify/node.tag/rule/node.tag/source/group/network-group/node.def +++ b/templates/firewall/modify/node.tag/rule/node.tag/source/group/network-group/node.def @@ -5,6 +5,4 @@ commit:expression: exec "sudo /opt/vyatta/sbin/vyatta-ipset.pl \ --action=check-set-type \ --set-name=$VAR(@) \ --set-type=network;" -allowed: local -a array - array=( /opt/vyatta/config/active/firewall/group/network-group/* ) - echo -n ${array[@]##*/} +allowed: cli-shell-api listActiveNodes firewall group network-group diff --git a/templates/firewall/modify/node.tag/rule/node.tag/source/group/port-group/node.def b/templates/firewall/modify/node.tag/rule/node.tag/source/group/port-group/node.def index f6a6844..865d2c5 100644 --- a/templates/firewall/modify/node.tag/rule/node.tag/source/group/port-group/node.def +++ b/templates/firewall/modify/node.tag/rule/node.tag/source/group/port-group/node.def @@ -5,6 +5,4 @@ commit:expression: exec "sudo /opt/vyatta/sbin/vyatta-ipset.pl \ --action=check-set-type \ --set-name=$VAR(@) \ --set-type=port;" -allowed: local -a array - array=( /opt/vyatta/config/active/firewall/group/port-group/* ) - echo -n ${array[@]##*/} +allowed: cli-shell-api listActiveNodes firewall group port-group diff --git a/templates/firewall/name/node.tag/rule/node.tag/destination/group/address-group/node.def b/templates/firewall/name/node.tag/rule/node.tag/destination/group/address-group/node.def index b768dee..07e791c 100644 --- a/templates/firewall/name/node.tag/rule/node.tag/destination/group/address-group/node.def +++ b/templates/firewall/name/node.tag/rule/node.tag/destination/group/address-group/node.def @@ -6,6 +6,4 @@ commit:expression: exec "sudo /opt/vyatta/sbin/vyatta-ipset.pl \ --set-name=$VAR(@) \ --set-type=address;" -allowed: local -a array - array=( /opt/vyatta/config/active/firewall/group/address-group/* ) - echo -n ${array[@]##*/} +allowed: cli-shell-api listActiveNodes firewall group address-group diff --git a/templates/firewall/name/node.tag/rule/node.tag/destination/group/network-group/node.def b/templates/firewall/name/node.tag/rule/node.tag/destination/group/network-group/node.def index 77a8e81..bf018a0 100644 --- a/templates/firewall/name/node.tag/rule/node.tag/destination/group/network-group/node.def +++ b/templates/firewall/name/node.tag/rule/node.tag/destination/group/network-group/node.def @@ -5,6 +5,4 @@ commit:expression: exec "sudo /opt/vyatta/sbin/vyatta-ipset.pl \ --action=check-set-type \ --set-name=$VAR(@) \ --set-type=network;" -allowed: local -a array - array=( /opt/vyatta/config/active/firewall/group/network-group/* ) - echo -n ${array[@]##*/} +allowed: cli-shell-api listActiveNodes firewall group network-group diff --git a/templates/firewall/name/node.tag/rule/node.tag/destination/group/port-group/node.def b/templates/firewall/name/node.tag/rule/node.tag/destination/group/port-group/node.def index f6a6844..865d2c5 100644 --- a/templates/firewall/name/node.tag/rule/node.tag/destination/group/port-group/node.def +++ b/templates/firewall/name/node.tag/rule/node.tag/destination/group/port-group/node.def @@ -5,6 +5,4 @@ commit:expression: exec "sudo /opt/vyatta/sbin/vyatta-ipset.pl \ --action=check-set-type \ --set-name=$VAR(@) \ --set-type=port;" -allowed: local -a array - array=( /opt/vyatta/config/active/firewall/group/port-group/* ) - echo -n ${array[@]##*/} +allowed: cli-shell-api listActiveNodes firewall group port-group diff --git a/templates/firewall/name/node.tag/rule/node.tag/source/group/address-group/node.def b/templates/firewall/name/node.tag/rule/node.tag/source/group/address-group/node.def index d70ba0f..97c748d 100644 --- a/templates/firewall/name/node.tag/rule/node.tag/source/group/address-group/node.def +++ b/templates/firewall/name/node.tag/rule/node.tag/source/group/address-group/node.def @@ -5,6 +5,4 @@ commit:expression: exec "sudo /opt/vyatta/sbin/vyatta-ipset.pl \ --action=check-set-type \ --set-name=$VAR(@) \ --set-type=address;" -allowed: local -a array - array=( /opt/vyatta/config/active/firewall/group/address-group/* ) - echo -n ${array[@]##*/} +allowed: cli-shell-api listActiveNodes firewall group address-group diff --git a/templates/firewall/name/node.tag/rule/node.tag/source/group/network-group/node.def b/templates/firewall/name/node.tag/rule/node.tag/source/group/network-group/node.def index 77a8e81..bf018a0 100644 --- a/templates/firewall/name/node.tag/rule/node.tag/source/group/network-group/node.def +++ b/templates/firewall/name/node.tag/rule/node.tag/source/group/network-group/node.def @@ -5,6 +5,4 @@ commit:expression: exec "sudo /opt/vyatta/sbin/vyatta-ipset.pl \ --action=check-set-type \ --set-name=$VAR(@) \ --set-type=network;" -allowed: local -a array - array=( /opt/vyatta/config/active/firewall/group/network-group/* ) - echo -n ${array[@]##*/} +allowed: cli-shell-api listActiveNodes firewall group network-group diff --git a/templates/firewall/name/node.tag/rule/node.tag/source/group/port-group/node.def b/templates/firewall/name/node.tag/rule/node.tag/source/group/port-group/node.def index f6a6844..865d2c5 100644 --- a/templates/firewall/name/node.tag/rule/node.tag/source/group/port-group/node.def +++ b/templates/firewall/name/node.tag/rule/node.tag/source/group/port-group/node.def @@ -5,6 +5,4 @@ commit:expression: exec "sudo /opt/vyatta/sbin/vyatta-ipset.pl \ --action=check-set-type \ --set-name=$VAR(@) \ --set-type=port;" -allowed: local -a array - array=( /opt/vyatta/config/active/firewall/group/port-group/* ) - echo -n ${array[@]##*/} +allowed: cli-shell-api listActiveNodes firewall group port-group |