webproxy: T563: squidguard: support default ruleset

2 files changed, 19 insertions, 19 deletions

diff --git a/interface-definitions/include/webproxy-squidguard.xml.i b/interface-definitions/include/webproxy-url-filtering.xml.i
index 6958056d4..de6ebffde 100644
--- a/interface-definitions/include/webproxy-squidguard.xml.i
+++ b/interface-definitions/include/webproxy-url-filtering.xml.i
@@ -1,4 +1,4 @@
-<!-- included start from webproxy-squidguard.xml.i -->

+<!-- included start from webproxy-url-filtering.xml.i -->

 <leafNode name="allow-category">

   <properties>

     <help>Category to allow</help>

@@ -25,17 +25,17 @@
 </leafNode>

 <leafNode name="default-action">

   <properties>

-    <help>Default action</help>

+    <help>Default action (default: allow)</help>

     <completionHelp>

       <list>allow block</list>

     </completionHelp>

     <valueHelp>

       <format>allow</format>

-      <description>Default filter action to allow (default)</description>

+      <description>Default filter action is allow)</description>

     </valueHelp>

     <valueHelp>

       <format>block</format>

-      <description>Default filter action to allow (default)</description>

+      <description>Default filter action is block</description>

     </valueHelp>

     <constraint>

       <regex>^(allow|block)$</regex>

@@ -45,6 +45,7 @@
 <leafNode name="enable-safe-search">

   <properties>

     <help>Enable safe-mode search on popular search engines</help>

+    <valueless/>

   </properties>

 </leafNode>

 <leafNode name="local-block-keyword">

@@ -62,11 +63,8 @@
     <help>Local URL to block</help>

     <valueHelp>

       <format>url</format>

-      <description>Local URL to block (without http:\/\/</description>

+      <description>Local URL to block (without "http://")</description>

     </valueHelp>

-    <constraint>

-      <regex>^(https?:\/\/)$</regex>

-    </constraint>

     <multi/>

   </properties>

 </leafNode>

@@ -78,7 +76,8 @@
       <description>IP address of site to block</description>

     </valueHelp>

     <constraint>

-      <validator name="ipv4-prefix"/>

+      <validator name="ipv4-address"/>

+      <validator name="fqdn"/>

     </constraint>

     <multi/>

   </properties>

@@ -88,11 +87,8 @@
     <help>Local URL to allow</help>

     <valueHelp>

       <format>url</format>

-      <description>Local URL to allow (without http:\/\/</description>

+      <description>Local URL to allow (without "http://")</description>

     </valueHelp>

-    <constraint>

-      <regex>^(https?:\/\/)$</regex>

-    </constraint>

     <multi/>

   </properties>

 </leafNode>

@@ -104,7 +100,8 @@
       <description>IP address of site to allow</description>

     </valueHelp>

     <constraint>

-      <validator name="ipv4-prefix"/>

+      <validator name="ipv4-address"/>

+      <validator name="fqdn"/>

     </constraint>

     <multi/>

   </properties>

diff --git a/interface-definitions/service_webproxy.xml.in b/interface-definitions/service_webproxy.xml.in
index ba33a30f4..4cd8138ec 100644
--- a/interface-definitions/service_webproxy.xml.in
+++ b/interface-definitions/service_webproxy.xml.in
@@ -171,11 +171,11 @@
                   <help>Hostname or IP address of peer</help>
                   <valueHelp>
                     <format>ipv4</format>
-                    <description>Remote syslog server IPv4 address</description>
+                    <description>Squid cache-peer IPv4 address</description>
                   </valueHelp>
                   <valueHelp>
                     <format>hostname</format>
-                    <description>Remote syslog server FQDN</description>
+                    <description>Squid cache-peer hostname</description>
                   </valueHelp>
                   <constraint>
                     <validator name="ip-address"/>
@@ -293,7 +293,10 @@
           </leafNode>
           <tagNode name="listen-address">
             <properties>
-              <help>IPv4 address for webproxy to listen on [REQUIRED]</help>
+              <help>IPv4 listen-address for WebProxy [REQUIRED]</help>
+              <completionHelp>
+                <script>${vyos_completion_dir}/list_local_ips.sh --ipv4</script>
+              </completionHelp>
               <valueHelp>
                 <format>ipv4</format>
                 <description>IPv4 address listen on</description>
@@ -402,7 +405,7 @@
                   <help>URL filtering via squidGuard redirector</help>
                 </properties>
                 <children>
-                  #include <include/webproxy-squidguard.xml.i>
+                  #include <include/webproxy-url-filtering.xml.i>
                   <node name="auto-update">
                     <properties>
                       <help>Auto update settings</help>
@@ -446,7 +449,7 @@
                       <constraintErrorMessage>SquidGuard rule must between 1-1024</constraintErrorMessage>
                     </properties>
                     <children>
-                      #include <include/webproxy-squidguard.xml.i>
+                      #include <include/webproxy-url-filtering.xml.i>
                       <leafNode name="redirect-url">
                         <properties>
                           <help>Redirect URL for filtered websites</help>