From 6df907f8623edb1b48189fa4db97baceb56b9f29 Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Sun, 29 Jul 2018 20:26:57 +0200 Subject: T757: Rewrite 'service dns dynamic' in new XML style format --- templates/service/dns/dynamic/interface/node.def | 15 --------------- .../dns/dynamic/interface/node.tag/rfc2136/node.def | 8 -------- .../interface/node.tag/rfc2136/node.tag/key/node.def | 4 ---- .../interface/node.tag/rfc2136/node.tag/record/node.def | 3 --- .../interface/node.tag/rfc2136/node.tag/server/node.def | 2 -- .../interface/node.tag/rfc2136/node.tag/ttl/node.def | 5 ----- .../interface/node.tag/rfc2136/node.tag/zone/node.def | 2 -- .../dns/dynamic/interface/node.tag/service/node.def | 9 --------- .../node.tag/service/node.tag/host-name/node.def | 3 --- .../interface/node.tag/service/node.tag/login/node.def | 2 -- .../interface/node.tag/service/node.tag/password/node.def | 2 -- .../interface/node.tag/service/node.tag/protocol/node.def | 6 ------ .../interface/node.tag/service/node.tag/server/node.def | 4 ---- .../dns/dynamic/interface/node.tag/use-web/node.def | 1 - .../dns/dynamic/interface/node.tag/use-web/skip/node.def | 2 -- .../dns/dynamic/interface/node.tag/use-web/url/node.def | 2 -- templates/service/dns/dynamic/node.def | 3 --- templates/service/dns/node.def | 1 - templates/service/node.def | 1 - 19 files changed, 75 deletions(-) delete mode 100644 templates/service/dns/dynamic/interface/node.def delete mode 100644 templates/service/dns/dynamic/interface/node.tag/rfc2136/node.def delete mode 100644 templates/service/dns/dynamic/interface/node.tag/rfc2136/node.tag/key/node.def delete mode 100644 templates/service/dns/dynamic/interface/node.tag/rfc2136/node.tag/record/node.def delete mode 100644 templates/service/dns/dynamic/interface/node.tag/rfc2136/node.tag/server/node.def delete mode 100644 templates/service/dns/dynamic/interface/node.tag/rfc2136/node.tag/ttl/node.def delete mode 100644 templates/service/dns/dynamic/interface/node.tag/rfc2136/node.tag/zone/node.def delete mode 100644 templates/service/dns/dynamic/interface/node.tag/service/node.def delete mode 100644 templates/service/dns/dynamic/interface/node.tag/service/node.tag/host-name/node.def delete mode 100644 templates/service/dns/dynamic/interface/node.tag/service/node.tag/login/node.def delete mode 100644 templates/service/dns/dynamic/interface/node.tag/service/node.tag/password/node.def delete mode 100644 templates/service/dns/dynamic/interface/node.tag/service/node.tag/protocol/node.def delete mode 100644 templates/service/dns/dynamic/interface/node.tag/service/node.tag/server/node.def delete mode 100644 templates/service/dns/dynamic/interface/node.tag/use-web/node.def delete mode 100644 templates/service/dns/dynamic/interface/node.tag/use-web/skip/node.def delete mode 100644 templates/service/dns/dynamic/interface/node.tag/use-web/url/node.def delete mode 100644 templates/service/dns/dynamic/node.def delete mode 100644 templates/service/dns/node.def delete mode 100644 templates/service/node.def (limited to 'templates') diff --git a/templates/service/dns/dynamic/interface/node.def b/templates/service/dns/dynamic/interface/node.def deleted file mode 100644 index c6cc6782..00000000 --- a/templates/service/dns/dynamic/interface/node.def +++ /dev/null @@ -1,15 +0,0 @@ -tag: -help: Interface to send DDNS updates for [REQUIRED] -type: txt -allowed: /opt/vyatta/sbin/vyatta-interfaces.pl --show=all -commit:expression: $VAR(./@/service/@@) != "" || $VAR(./@/rfc2136/@@) != ""; "At least one service must be set to send DDNS updates for $VAR(@)" -commit:expression: exec "/opt/vyatta/sbin/vyatta-interfaces.pl --dev=$VAR(@) --warn" - -delete:touch /tmp/ddclient_$VAR(@).$PPID - -end: if [ -f /tmp/ddclient_$VAR(@).$PPID ]; then - sudo /opt/vyatta/sbin/vyatta-dynamic-dns.pl --stop-dynamicdns --interface $VAR(@) - rm /tmp/ddclient_$VAR(@).$PPID - else - sudo /opt/vyatta/sbin/vyatta-dynamic-dns.pl --update-dynamicdns --interface $VAR(@) - fi diff --git a/templates/service/dns/dynamic/interface/node.tag/rfc2136/node.def b/templates/service/dns/dynamic/interface/node.tag/rfc2136/node.def deleted file mode 100644 index 7da9e2ea..00000000 --- a/templates/service/dns/dynamic/interface/node.tag/rfc2136/node.def +++ /dev/null @@ -1,8 +0,0 @@ -tag: -help: RFC2136 Update name -type: txt - -commit:expression: $VAR(./@/zone) != ""; "Set zone for service $VAR(./@) to send DDNS updates for interface $VAR(../@)" -commit:expression: $VAR(./@/key) != ""; "Set key for service $VAR(./@) to send DDNS updates for interface $VAR(../@)" -commit:expression: $VAR(./@/record) != ""; "Set record for service $VAR(./@) to send DDNS updates for interface $VAR(../@)" -commit:expression: $VAR(./@/server) != ""; "Set server for service $VAR(./@) to send DDNS updates for interface $VAR(../@)" diff --git a/templates/service/dns/dynamic/interface/node.tag/rfc2136/node.tag/key/node.def b/templates/service/dns/dynamic/interface/node.tag/rfc2136/node.tag/key/node.def deleted file mode 100644 index 0519591d..00000000 --- a/templates/service/dns/dynamic/interface/node.tag/rfc2136/node.tag/key/node.def +++ /dev/null @@ -1,4 +0,0 @@ -type: txt -help: File containing the secret key shared with remote DNS server [REQUIRED] -syntax:expression: exec "/opt/vyatta/sbin/check_file_in_config_dir $VAR(@) '/config/auth'" -val_help: File in /config/auth diff --git a/templates/service/dns/dynamic/interface/node.tag/rfc2136/node.tag/record/node.def b/templates/service/dns/dynamic/interface/node.tag/rfc2136/node.tag/record/node.def deleted file mode 100644 index 11051296..00000000 --- a/templates/service/dns/dynamic/interface/node.tag/rfc2136/node.tag/record/node.def +++ /dev/null @@ -1,3 +0,0 @@ -multi: -help: Record to be updated [REQUIRED] -type: txt diff --git a/templates/service/dns/dynamic/interface/node.tag/rfc2136/node.tag/server/node.def b/templates/service/dns/dynamic/interface/node.tag/rfc2136/node.tag/server/node.def deleted file mode 100644 index 7bc5b0cb..00000000 --- a/templates/service/dns/dynamic/interface/node.tag/rfc2136/node.tag/server/node.def +++ /dev/null @@ -1,2 +0,0 @@ -help: Server to be updated [REQUIRED] -type: txt diff --git a/templates/service/dns/dynamic/interface/node.tag/rfc2136/node.tag/ttl/node.def b/templates/service/dns/dynamic/interface/node.tag/rfc2136/node.tag/ttl/node.def deleted file mode 100644 index 9483750c..00000000 --- a/templates/service/dns/dynamic/interface/node.tag/rfc2136/node.tag/ttl/node.def +++ /dev/null @@ -1,5 +0,0 @@ -type: u32 - -help: Time To Live - -default: 600 diff --git a/templates/service/dns/dynamic/interface/node.tag/rfc2136/node.tag/zone/node.def b/templates/service/dns/dynamic/interface/node.tag/rfc2136/node.tag/zone/node.def deleted file mode 100644 index cc42bcf3..00000000 --- a/templates/service/dns/dynamic/interface/node.tag/rfc2136/node.tag/zone/node.def +++ /dev/null @@ -1,2 +0,0 @@ -help: Zone to be updated [REQUIRED] -type: txt diff --git a/templates/service/dns/dynamic/interface/node.tag/service/node.def b/templates/service/dns/dynamic/interface/node.tag/service/node.def deleted file mode 100644 index 32802065..00000000 --- a/templates/service/dns/dynamic/interface/node.tag/service/node.def +++ /dev/null @@ -1,9 +0,0 @@ -tag: -help: Service being used for Dynamic DNS [REQUIRED] -type: txt - -val_help: txt; Custom or predefined service - -allowed: /opt/vyatta/sbin/vyatta-dynamic-dns.pl --interface $VAR(../@) --get-services - -commit:expression: exec "/opt/vyatta/sbin/vyatta-dynamic-dns.pl --interface $VAR(../@) --check-nodes" diff --git a/templates/service/dns/dynamic/interface/node.tag/service/node.tag/host-name/node.def b/templates/service/dns/dynamic/interface/node.tag/service/node.tag/host-name/node.def deleted file mode 100644 index 9c2647fb..00000000 --- a/templates/service/dns/dynamic/interface/node.tag/service/node.tag/host-name/node.def +++ /dev/null @@ -1,3 +0,0 @@ -multi: -help: Hostname registered with DDNS service [REQUIRED] -type: txt diff --git a/templates/service/dns/dynamic/interface/node.tag/service/node.tag/login/node.def b/templates/service/dns/dynamic/interface/node.tag/service/node.tag/login/node.def deleted file mode 100644 index 9ddb1b75..00000000 --- a/templates/service/dns/dynamic/interface/node.tag/service/node.tag/login/node.def +++ /dev/null @@ -1,2 +0,0 @@ -help: Login for DDNS service [REQUIRED] -type: txt diff --git a/templates/service/dns/dynamic/interface/node.tag/service/node.tag/password/node.def b/templates/service/dns/dynamic/interface/node.tag/service/node.tag/password/node.def deleted file mode 100644 index 48507c49..00000000 --- a/templates/service/dns/dynamic/interface/node.tag/service/node.tag/password/node.def +++ /dev/null @@ -1,2 +0,0 @@ -help: Password for DDNS service [REQUIRED] -type: txt diff --git a/templates/service/dns/dynamic/interface/node.tag/service/node.tag/protocol/node.def b/templates/service/dns/dynamic/interface/node.tag/service/node.tag/protocol/node.def deleted file mode 100644 index d59a46d7..00000000 --- a/templates/service/dns/dynamic/interface/node.tag/service/node.tag/protocol/node.def +++ /dev/null @@ -1,6 +0,0 @@ -help: ddclient protocol used for DDNS service [REQUIRED FOR CUSTOM] -type: txt -val_help: ; ddclient protocol - -allowed: /opt/vyatta/sbin/vyatta-dynamic-dns.pl --interface $VAR(../@) --get-protocols - \ No newline at end of file diff --git a/templates/service/dns/dynamic/interface/node.tag/service/node.tag/server/node.def b/templates/service/dns/dynamic/interface/node.tag/service/node.tag/server/node.def deleted file mode 100644 index fc0fb20c..00000000 --- a/templates/service/dns/dynamic/interface/node.tag/service/node.tag/server/node.def +++ /dev/null @@ -1,4 +0,0 @@ -help: Server to send DDNS update to [REQUIRED FOR CUSTOM] -type: txt -val_help: ipv4; IP address of DDNS server -val_help: ; Hostname of DDNS server diff --git a/templates/service/dns/dynamic/interface/node.tag/use-web/node.def b/templates/service/dns/dynamic/interface/node.tag/use-web/node.def deleted file mode 100644 index f1b86b6d..00000000 --- a/templates/service/dns/dynamic/interface/node.tag/use-web/node.def +++ /dev/null @@ -1 +0,0 @@ -help: Web check used for obtaining the external IP address diff --git a/templates/service/dns/dynamic/interface/node.tag/use-web/skip/node.def b/templates/service/dns/dynamic/interface/node.tag/use-web/skip/node.def deleted file mode 100644 index f316a4b5..00000000 --- a/templates/service/dns/dynamic/interface/node.tag/use-web/skip/node.def +++ /dev/null @@ -1,2 +0,0 @@ -help: Skip everything before this on the given URL -type: txt diff --git a/templates/service/dns/dynamic/interface/node.tag/use-web/url/node.def b/templates/service/dns/dynamic/interface/node.tag/use-web/url/node.def deleted file mode 100644 index 164ddde4..00000000 --- a/templates/service/dns/dynamic/interface/node.tag/use-web/url/node.def +++ /dev/null @@ -1,2 +0,0 @@ -help: URL to obtain the current external IP address -type: txt diff --git a/templates/service/dns/dynamic/node.def b/templates/service/dns/dynamic/node.def deleted file mode 100644 index af9186fd..00000000 --- a/templates/service/dns/dynamic/node.def +++ /dev/null @@ -1,3 +0,0 @@ -priority: 919 -help: Dynamic DNS -commit:expression: $VAR(./interface/@@) != ""; "At least one interface must be set to send DDNS updates for" diff --git a/templates/service/dns/node.def b/templates/service/dns/node.def deleted file mode 100644 index 8600e279..00000000 --- a/templates/service/dns/node.def +++ /dev/null @@ -1 +0,0 @@ -help: Domain Name Server (DNS) parameters diff --git a/templates/service/node.def b/templates/service/node.def deleted file mode 100644 index 0682c74c..00000000 --- a/templates/service/node.def +++ /dev/null @@ -1 +0,0 @@ -help: Services -- cgit v1.2.3