16 files changed, 14 insertions, 78 deletions
diff --git a/templates/system/console/device/node.tag/speed/node.def b/templates/system/console/device/node.tag/speed/node.def
index e7515dca..3a117301 100644
--- a/templates/system/console/device/node.tag/speed/node.def
+++ b/templates/system/console/device/node.tag/speed/node.def
@@ -1,5 +1,5 @@
 type: u32
-help: Console baud rate
+help: Console baud rate. New rate will take effect on reboot.
 allowed: echo 1200 2400 4800 9600 19200 38400 57600 115200
 syntax:expression: $VAR(@) in 1200, 2400, 4800, 9600, 19200, 38400, \
 	57600, 115200 ; "unknown baud rate"
diff --git a/templates/system/domain-name/node.def b/templates/system/domain-name/node.def
deleted file mode 100644
index 4866ddf8..00000000
--- a/templates/system/domain-name/node.def
+++ /dev/null
@@ -1,12 +0,0 @@
-priority: 400
-type: txt
-help: System domain name
-
-# Allow letter-number-hyphen in label (but can not start or end with hyphen)
-syntax:expression: exec "/opt/vyatta/sbin/vyatta_check_domainname.pl $VAR(../host-name).$VAR(@)"
-
-update: sudo /opt/vyatta/sbin/vyatta_update_resolv.pl
-        sudo /opt/vyatta/sbin/vyatta_update_hosts.pl --no-restart-services
-
-delete: sudo /opt/vyatta/sbin/vyatta_update_resolv.pl
-        sudo /opt/vyatta/sbin/vyatta_update_hosts.pl --no-restart-services
diff --git a/templates/system/host-name/node.def b/templates/system/host-name/node.def
deleted file mode 100644
index 00798bef..00000000
--- a/templates/system/host-name/node.def
+++ /dev/null
@@ -1,12 +0,0 @@
-priority: 100
-type: txt
-help: System host name (default: vyos)
-default: "vyos"
-syntax:expression: pattern $VAR(@) "^[[:alnum:]][-.[:alnum:]]*[[:alnum:]]$"
-                   ; "invalid host name $VAR(@)"
-
-syntax:expression: pattern $VAR(@) "^.{1,63}$" ; "invalid host-name length"
-
-update: sudo /opt/vyatta/sbin/vyatta_update_hosts.pl
-
-delete: sudo /opt/vyatta/sbin/vyatta_update_hosts.pl
diff --git a/templates/system/login/user/node.tag/authentication/public-keys/node.tag/type/node.def b/templates/system/login/user/node.tag/authentication/public-keys/node.tag/type/node.def
index 5ad1c58b..bf789e06 100644
--- a/templates/system/login/user/node.tag/authentication/public-keys/node.tag/type/node.def
+++ b/templates/system/login/user/node.tag/authentication/public-keys/node.tag/type/node.def
@@ -1,4 +1,4 @@
 type: txt
 help: Public key type
-allowed: echo "ssh-dss ssh-rsa"
-syntax:expression: $VAR(@) in "ssh-rsa", "ssh-dss" ; "Unknown key type"
+allowed: echo "ssh-dss ssh-rsa ecdsa-sha2-nistp256 ecdsa-sha2-nistp384 ecdsa-sha2-nistp521 ssh-ed25519"
+syntax:expression: $VAR(@) in "ssh-rsa", "ssh-dss", "ecdsa-sha2-nistp256", "ecdsa-sha2-nistp384", "ecdsa-sha2-nistp521", "ssh-ed25519"; "Unknown key type"
diff --git a/templates/system/ntp/client/address/node.def b/templates/system/ntp/client/address/node.def
deleted file mode 100644
index a48a2b5a..00000000
--- a/templates/system/ntp/client/address/node.def
+++ /dev/null
@@ -1,6 +0,0 @@
-multi:
-type: ipv4net,ipv6net
-help: IP address
-
-val_help: ipv4net; IP address and prefix length
-val_help: ipv6net; IPv6 address and prefix length
diff --git a/templates/system/ntp/client/node.def b/templates/system/ntp/client/node.def
deleted file mode 100644
index dd849f8f..00000000
--- a/templates/system/ntp/client/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Network Time Protocol (NTP) client
diff --git a/templates/system/ntp/node.def b/templates/system/ntp/node.def
deleted file mode 100644
index 38e67e05..00000000
--- a/templates/system/ntp/node.def
+++ /dev/null
@@ -1,16 +0,0 @@
-priority: 400
-help: Network Time Protocol (NTP) configuration
-
-end: 
-     sudo /opt/vyatta/sbin/vyatta_update_ntp.pl
-     if grep -q '^server' /etc/ntp.conf
-     then 
-	 if pgrep -f -u ntp /usr/sbin/ntpd > /dev/null
-	 then
-	     sudo /usr/sbin/invoke-rc.d ntp force-reload
-         else
-	     sudo /usr/sbin/invoke-rc.d ntp start
-	 fi
-     else
-	 sudo /usr/sbin/invoke-rc.d ntp stop
-     fi
diff --git a/templates/system/ntp/server/node.def b/templates/system/ntp/server/node.def
deleted file mode 100644
index 383bd992..00000000
--- a/templates/system/ntp/server/node.def
+++ /dev/null
@@ -1,3 +0,0 @@
-tag:
-type: txt
-help: Network Time Protocol (NTP) server
diff --git a/templates/system/ntp/server/node.tag/dynamic/node.def b/templates/system/ntp/server/node.tag/dynamic/node.def
deleted file mode 100644
index 2d68de16..00000000
--- a/templates/system/ntp/server/node.tag/dynamic/node.def
+++ /dev/null
@@ -1,2 +0,0 @@
-help: Allow server to be configured even if not reachable
-
diff --git a/templates/system/ntp/server/node.tag/noselect/node.def b/templates/system/ntp/server/node.tag/noselect/node.def
deleted file mode 100644
index e2e061b5..00000000
--- a/templates/system/ntp/server/node.tag/noselect/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Marks the server as unused
diff --git a/templates/system/ntp/server/node.tag/preempt/node.def b/templates/system/ntp/server/node.tag/preempt/node.def
deleted file mode 100644
index ca89efa1..00000000
--- a/templates/system/ntp/server/node.tag/preempt/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Specifies the association as preemptable rather than the default persistent
diff --git a/templates/system/ntp/server/node.tag/prefer/node.def b/templates/system/ntp/server/node.tag/prefer/node.def
deleted file mode 100644
index 4855fd41..00000000
--- a/templates/system/ntp/server/node.tag/prefer/node.def
+++ /dev/null
@@ -1 +0,0 @@
-help: Marks the server as preferred
diff --git a/templates/system/options/ctrl-alt-del-action/node.def b/templates/system/options/ctrl-alt-del-action/node.def
index 3bbf2a81..a853b151 100644
--- a/templates/system/options/ctrl-alt-del-action/node.def
+++ b/templates/system/options/ctrl-alt-del-action/node.def
@@ -12,15 +12,15 @@ syntax:expression: $VAR(@) in "ignore", "reboot", "poweroff"; "Value must be ign
 
 end:
   if [ $VAR(@) == "ignore" ]; then
-    sudo sh -c "sed -i -e 's/^ca.*/ca:12345:ctrlaltdel:/' \
-      /etc/inittab"
+    sudo sh -c "ln -sf /dev/null \
+      /lib/systemd/system/ctrl-alt-del.target"
   elif [ $VAR(@) == "reboot" ]; then
-    sudo sh -c "sed -i -e 's/^ca.*/ca:12345:ctrlaltdel:\/sbin\/reboot/' \
-      /etc/inittab"
+    sudo sh -c "ln -sf /lib/systemd/system/reboot.target \
+      /lib/systemd/system/ctrl-alt-del.target"
   elif [ $VAR(@) == "poweroff" ]; then
-    sudo sh -c "sed -i -e 's/^ca.*/ca:12345:ctrlaltdel:\/sbin\/shutdown -h now/' \
-      /etc/inittab"
+    sudo sh -c "ln -sf /lib/systemd/system/poweroff.target \
+      /lib/systemd/system/ctrl-alt-del.target"
   fi
 
-  # Reload /etc/inittab for change to take effect
-  sudo /sbin/init q
+  # Reload systemd daemon for change to take effect
+  sudo /bin/systemctl daemon-reload
diff --git a/templates/system/options/enable-popularity-contest/node.def b/templates/system/options/enable-popularity-contest/node.def
deleted file mode 100644
index 3f048352..00000000
--- a/templates/system/options/enable-popularity-contest/node.def
+++ /dev/null
@@ -1,9 +0,0 @@
-help: Send anonymous system statistic to VyOS maintainers
-
-create:
-  sudo sh -c 'echo "#!/bin/sh" > /etc/cron.weekly/01vyos-popcon'
-  sudo sh -c 'echo "/opt/vyatta/bin/vyos-popcon.pl 2>&1 >/var/log/popcon.log" >> /etc/cron.weekly/01vyos-popcon'
-  sudo sh -c 'chmod +x /etc/cron.weekly/01vyos-popcon'
-
-delete:
-  sudo rm -f /etc/cron.weekly/01vyos-popcon
diff --git a/templates/system/static-host-mapping/host-name/node.def b/templates/system/static-host-mapping/host-name/node.def
index 09bc9dbe..9d815965 100644
--- a/templates/system/static-host-mapping/host-name/node.def
+++ b/templates/system/static-host-mapping/host-name/node.def
@@ -12,10 +12,10 @@ end: sudo sh -c "
   touch /etc/hosts
   sed -i '/ $VAR(@) .*#vyatta entry/d' /etc/hosts
   if [ -z \"$VAR(./inet/@)\" ]; then
-     if cli-shell-api existsActive service dns forwarding; then /etc/init.d/dnsmasq restart >&/dev/null; fi
+     if cli-shell-api existsActive service dns forwarding; then /etc/init.d/pdns-recursor 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 cli-shell-api existsActive service dns forwarding; then /etc/init.d/dnsmasq restart >&/dev/null; fi"
+  if cli-shell-api existsActive service dns forwarding; then /etc/init.d/pdns-recursor restart >&/dev/null; fi"
 
diff --git a/templates/system/sysctl/custom/node.def b/templates/system/sysctl/custom/node.def
index 4e6480ea..a072b2ba 100644
--- a/templates/system/sysctl/custom/node.def
+++ b/templates/system/sysctl/custom/node.def
@@ -1,5 +1,5 @@
 tag:
 priority: 318
 type: txt
-help: Define specific sysctl option to modify
+help: Define specific sysctl options to modify
 val_help: <sysctl_option> ; Name of sysctl option you want to modify