T644: remove prefixing from all scripts and update environment variables with VyOS paths.

7 files changed, 8 insertions, 11 deletions

diff --git a/interface-definitions/bcast-relay.xml b/interface-definitions/bcast-relay.xml
index bacf771ac..98c54051e 100644
--- a/interface-definitions/bcast-relay.xml
+++ b/interface-definitions/bcast-relay.xml
@@ -10,7 +10,7 @@
           <help>UDP Broadcast Relay parameters</help>
         </properties>
         <children>
-          <tagNode name="id" owner="${vyos_sbindir}/vyos-config_bcast_relay.py">
+          <tagNode name="id" owner="${vyos_conf_scripts_dir}/bcast_relay.py">
             <properties>
               <help>Unique ID for each UDP port to forward</help>
               <valueHelp>
diff --git a/interface-definitions/cron.xml b/interface-definitions/cron.xml
index fa2a589fa..2d4921bf0 100644
--- a/interface-definitions/cron.xml
+++ b/interface-definitions/cron.xml
@@ -10,7 +10,7 @@
           <help>Task scheduler settings</help>
         </properties>
         <children>
-          <tagNode name="task" owner="${vyos_sbindir}/vyos_update_crontab.py">
+          <tagNode name="task" owner="${vyos_conf_scripts_dir}/task_scheduler.py">
             <properties>
               <help>Scheduled task</help>
               <valueHelp>
diff --git a/interface-definitions/dns-forwarding.xml b/interface-definitions/dns-forwarding.xml
index 73180b9a4..ffc007a30 100644
--- a/interface-definitions/dns-forwarding.xml
+++ b/interface-definitions/dns-forwarding.xml
@@ -7,7 +7,7 @@
     <children>
       <node name="dns">
         <children>
-          <node name="forwarding" owner="${vyos_sbindir}/vyos_config_dns_forwarding.py">
+          <node name="forwarding" owner="${vyos_conf_scripts_dir}/dns_forwarding.py">
             <properties>
               <help>DNS forwarding</help>
               <priority>918</priority>
diff --git a/interface-definitions/host-name.xml b/interface-definitions/host-name.xml
index 7ccce89b4..6c7c373cc 100644
--- a/interface-definitions/host-name.xml
+++ b/interface-definitions/host-name.xml
@@ -5,7 +5,7 @@
 <interfaceDefinition>
   <node name="system">
     <children>
-      <leafNode name="host-name" owner="${vyos_sbindir}/vyos_config_host_name.py">
+      <leafNode name="host-name" owner="${vyos_conf_scripts_dir}/host_name.py">
         <properties>
           <help>System host name (default: vyos)</help>
           <constraint>
diff --git a/interface-definitions/mdns-repeater.xml b/interface-definitions/mdns-repeater.xml
index 82aa3235b..066b665cf 100644
--- a/interface-definitions/mdns-repeater.xml
+++ b/interface-definitions/mdns-repeater.xml
@@ -10,7 +10,7 @@
           <help>Multicast DNS (mDNS) parameters</help>
         </properties>
         <children>
-          <node name="repeater" owner="${vyos_sbindir}/vyos_config_mdns_repeater.py">
+          <node name="repeater" owner="${vyos_conf_scripts_dir}/mdns_repeater.py">
             <properties>
               <help>mDNS repeater configuration</help>
               <priority>990</priority>
diff --git a/interface-definitions/ntp.xml b/interface-definitions/ntp.xml
index 311d61dbe..4688454c3 100644
--- a/interface-definitions/ntp.xml
+++ b/interface-definitions/ntp.xml
@@ -5,7 +5,7 @@
 <interfaceDefinition>
   <node name="system">
     <children>
-      <node name="ntp" owner="${vyos_sbindir}/vyos_config_ntp.py">
+      <node name="ntp" owner="${vyos_conf_scripts_dir}/ntp.py">
         <properties>
           <help>Network Time Protocol (NTP) configuration</help>
           <priority>400</priority>
@@ -45,9 +45,6 @@
           <node name="allow-clients">
             <properties>
               <help>Network Time Protocol (NTP) server options</help>
-              <constraint>
-                <validator name="ip-prefix"/>
-              </constraint>
             </properties>
             <children>
               <leafNode name="address">
@@ -63,7 +60,7 @@
                   </valueHelp>
                   <multi/>
                   <constraint>
-                    <validator name="ip-address"/>
+                    <validator name="ip-prefix"/>
                   </constraint>
                 </properties>
               </leafNode>
diff --git a/interface-definitions/ssh.xml b/interface-definitions/ssh.xml
index 146aec6b6..22741c41a 100644
--- a/interface-definitions/ssh.xml
+++ b/interface-definitions/ssh.xml
@@ -5,7 +5,7 @@
 <interfaceDefinition>
   <node name="service">
     <children>
-      <node name="ssh" owner="${vyos_sbindir}/vyos_config_ssh.py">
+      <node name="ssh" owner="${vyos_conf_scripts_dir}/ssh.py">
         <properties>
           <help>Secure SHell (SSH) protocol</help>
           <priority>500</priority>