diff options
| author | An-Cheng Huang <ancheng@vyatta.com> | 2010-08-17 18:23:45 -0700 |
|---|---|---|
| committer | An-Cheng Huang <ancheng@vyatta.com> | 2010-08-17 18:23:45 -0700 |
| commit | fb51829bb0331dff762fd558d75ddc08154b010d (patch) | |
| tree | 93d3f54e335661b573fe0a71e512034bcd3749c7 /templates/show/firewall/modify | |
| parent | 89e458ec902617b04898be427d2b6546e91de460 (diff) | |
| download | vyatta-op-firewall-fb51829bb0331dff762fd558d75ddc08154b010d.tar.gz vyatta-op-firewall-fb51829bb0331dff762fd558d75ddc08154b010d.zip | |
remove low-level config dir usage
Diffstat (limited to 'templates/show/firewall/modify')
3 files changed, 11 insertions, 5 deletions
diff --git a/templates/show/firewall/modify/node.tag/detail/rule/node.tag/node.def b/templates/show/firewall/modify/node.tag/detail/rule/node.tag/node.def index bc451e3..c69f5ac 100644 --- a/templates/show/firewall/modify/node.tag/detail/rule/node.tag/node.def +++ b/templates/show/firewall/modify/node.tag/detail/rule/node.tag/node.def @@ -1,5 +1,8 @@ help: Show detailed information for specified IPv4 firewall modify rule -allowed: ls /opt/vyatta/config/active/firewall/modify/${COMP_WORDS[COMP_CWORD-3]}/rule/ 2>/dev/null +allowed: local -a vals + eval "vals=($(cli-shell-api listActiveNodes \ + firewall modify ${COMP_WORDS[COMP_CWORD-3]} rule))" + echo -n ${vals[@]} run: ${vyatta_bindir}/vyatta-show-firewall.pl "$3_$4" /opt/vyatta/share/xsl/show_firewall_detail.xsl "$7" diff --git a/templates/show/firewall/modify/node.tag/node.def b/templates/show/firewall/modify/node.tag/node.def index 1bdce47..bdae565 100644 --- a/templates/show/firewall/modify/node.tag/node.def +++ b/templates/show/firewall/modify/node.tag/node.def @@ -1,7 +1,7 @@ help: Show rules for given IPv4 firewall modify chain -allowed: - l1=`ls /opt/vyatta/config/active/firewall/modify/ 2>/dev/null` - echo $l1 +allowed: local -a vals + eval "vals=($(cli-shell-api listActiveNodes firewall modify))" + echo -n ${vals[@]} run: ${vyatta_bindir}/vyatta-show-firewall.pl "$3_$4" /opt/vyatta/share/xsl/show_firewall.xsl diff --git a/templates/show/firewall/modify/node.tag/rule/node.tag/node.def b/templates/show/firewall/modify/node.tag/rule/node.tag/node.def index be74324..d6cae43 100644 --- a/templates/show/firewall/modify/node.tag/rule/node.tag/node.def +++ b/templates/show/firewall/modify/node.tag/rule/node.tag/node.def @@ -1,5 +1,8 @@ help: Show summary of IPv4 firewall modify rules -allowed: ls /opt/vyatta/config/active/firewall/modify/${COMP_WORDS[COMP_CWORD-2]}/rule/ 2>/dev/null +allowed: local -a vals + eval "vals=($(cli-shell-api listActiveNodes \ + firewall modify ${COMP_WORDS[COMP_CWORD-2]} rule))" + echo -n ${vals[@]} run: ${vyatta_bindir}/vyatta-show-firewall.pl "$3_$4" /opt/vyatta/share/xsl/show_firewall.xsl "$6" |