diff options
| author | Mohit Mehta <mohit.mehta@vyatta.com> | 2008-08-05 16:35:44 +0000 |
|---|---|---|
| committer | Mohit Mehta <mohit.mehta@vyatta.com> | 2008-08-05 16:35:44 +0000 |
| commit | fe08c6b8586e63e9b441c73da1e9f712849e251e (patch) | |
| tree | d3ee21d6a391fc22279ff264fa03353cefb9ba65 | |
| parent | 5249053c47fd72a36870c2195eefabc7915b92e5 (diff) | |
| download | vyatta-cfg-system-fe08c6b8586e63e9b441c73da1e9f712849e251e.tar.gz vyatta-cfg-system-fe08c6b8586e63e9b441c73da1e9f712849e251e.zip | |
change DNS forwarding CLI from 'service dns-forwarding' to 'service dns forward'
| -rw-r--r-- | scripts/dns-forwarding/vyatta-dns-forwarding.pl | 2 | ||||
| -rw-r--r-- | templates/service/dns/forward/cache-size/node.def (renamed from templates/service/dns-forwarding/cache-size/node.def) | 0 | ||||
| -rw-r--r-- | templates/service/dns/forward/ignore-interface/node.def (renamed from templates/service/dns-forwarding/ignore-interface/node.def) | 0 | ||||
| -rw-r--r-- | templates/service/dns/forward/node.def (renamed from templates/service/dns-forwarding/node.def) | 0 | ||||
| -rw-r--r-- | templates/service/dns/node.def | 1 | ||||
| -rw-r--r-- | templates/system/static-host-mapping/host-name/node.def | 4 |
6 files changed, 4 insertions, 3 deletions
diff --git a/scripts/dns-forwarding/vyatta-dns-forwarding.pl b/scripts/dns-forwarding/vyatta-dns-forwarding.pl index 1fb2282a..672ec04b 100644 --- a/scripts/dns-forwarding/vyatta-dns-forwarding.pl +++ b/scripts/dns-forwarding/vyatta-dns-forwarding.pl @@ -61,7 +61,7 @@ sub dnsforwarding_get_values { my $output = ''; my $config = new VyattaConfig; - $config->setLevel("service dns-forwarding"); + $config->setLevel("service dns forward"); my @ignore_interfaces = $config->returnValues("ignore-interface"); if ($#ignore_interfaces >= 0) { diff --git a/templates/service/dns-forwarding/cache-size/node.def b/templates/service/dns/forward/cache-size/node.def index 3a73f308..3a73f308 100644 --- a/templates/service/dns-forwarding/cache-size/node.def +++ b/templates/service/dns/forward/cache-size/node.def diff --git a/templates/service/dns-forwarding/ignore-interface/node.def b/templates/service/dns/forward/ignore-interface/node.def index 5355eecf..5355eecf 100644 --- a/templates/service/dns-forwarding/ignore-interface/node.def +++ b/templates/service/dns/forward/ignore-interface/node.def diff --git a/templates/service/dns-forwarding/node.def b/templates/service/dns/forward/node.def index f84e4f02..f84e4f02 100644 --- a/templates/service/dns-forwarding/node.def +++ b/templates/service/dns/forward/node.def diff --git a/templates/service/dns/node.def b/templates/service/dns/node.def new file mode 100644 index 00000000..d7040d0d --- /dev/null +++ b/templates/service/dns/node.def @@ -0,0 +1 @@ +help: Configure Domain Name Server (DNS) parameters diff --git a/templates/system/static-host-mapping/host-name/node.def b/templates/system/static-host-mapping/host-name/node.def index 187b21dd..07e6b25b 100644 --- a/templates/system/static-host-mapping/host-name/node.def +++ b/templates/system/static-host-mapping/host-name/node.def @@ -7,10 +7,10 @@ end: sudo sh -c " touch /etc/hosts sed -i '/ $VAR(@) .*#vyatta entry/d' /etc/hosts if [ -z \"$VAR(./inet/@)\" ]; then - if [ -d /opt/vyatta/config/active/service/dns-forwarding ]; then /etc/init.d/dnsmasq restart >&/dev/null; fi + if [ -d /opt/vyatta/config/active/service/dns/forward ]; then /etc/init.d/dnsmasq restart >&/dev/null; fi exit 0 fi declare -a aliases=( $VAR(alias/@@) ) echo -e \"$VAR(inet/@)\\t $VAR(@) \${aliases[*]} \\t #vyatta entry\" >> /etc/hosts - if [ -d /opt/vyatta/config/active/service/dns-forwarding ]; then /etc/init.d/dnsmasq restart >&/dev/null; fi" + if [ -d /opt/vyatta/config/active/service/dns/forward ]; then /etc/init.d/dnsmasq restart >&/dev/null; fi" |