diff options
| author | Daniil Baturin <daniil@baturin.org> | 2018-06-24 12:50:17 +0200 |
|---|---|---|
| committer | Daniil Baturin <daniil@baturin.org> | 2018-06-24 12:50:17 +0200 |
| commit | bacecf80ea16d3cd30dc7c98c98af013b2adc258 (patch) | |
| tree | 2b1d6f48708ace28ae4f6c9893ee50f6f390c6b7 /templates/service/dns/forwarding/domain | |
| parent | 0d8e75e2e808ccf366a1527647a6353c09d92237 (diff) | |
| parent | 0f19dc57ed6588c083eee8aa9aee09b92b441b08 (diff) | |
| download | vyatta-cfg-system-lithium.tar.gz vyatta-cfg-system-lithium.zip | |
Merge branch 'current' into lithiumlithium
Conflicts:
debian/changelog
scripts/snmp/vyatta-snmp-v3.pl
scripts/snmp/vyatta-snmp.pl
templates/interfaces/tunnel/node.def
templates/system/sysctl/custom/node.def
Diffstat (limited to 'templates/service/dns/forwarding/domain')
| -rw-r--r-- | templates/service/dns/forwarding/domain/node.def | 4 | ||||
| -rw-r--r-- | templates/service/dns/forwarding/domain/node.tag/server/node.def | 3 |
2 files changed, 0 insertions, 7 deletions
diff --git a/templates/service/dns/forwarding/domain/node.def b/templates/service/dns/forwarding/domain/node.def deleted file mode 100644 index bdd82752..00000000 --- a/templates/service/dns/forwarding/domain/node.def +++ /dev/null @@ -1,4 +0,0 @@ -tag: -type: txt -help: DNS domain to forward to a local server -commit:expression: $VAR(./server/) != ""; "Error: No server configured for the domain $VAR(@)" diff --git a/templates/service/dns/forwarding/domain/node.tag/server/node.def b/templates/service/dns/forwarding/domain/node.tag/server/node.def deleted file mode 100644 index 8f40a299..00000000 --- a/templates/service/dns/forwarding/domain/node.tag/server/node.def +++ /dev/null @@ -1,3 +0,0 @@ -multi: -type: ipv4 -help: DNS server to forward queries |