From 876786654552b40180a34b73c6eb327722d09e15 Mon Sep 17 00:00:00 2001
From: Christian Breunig <christian@breunig.cc>
Date: Mon, 5 May 2025 20:52:57 +0200
Subject: haproxy: T7429: remove unsupported logging facility and log level

VyOS 1.4.1 implemented support for logging facilities for HAProxy. The
facilities got included from the syslog XML definition, which also added
"virtual" or non existing facilities in HAProxy, namely: all, authpriv and mark.

If any of the above facilities is set, HAProxy will not start.

The XML definition for syslog also came with an arbitrary log-level "all" that
is also unsupported in HAProxy.

This commit adds a migration script removing the illegal CLI nodes.
---
 .../include/haproxy/logging.xml.i                  | 132 ++++++++++++++++++++-
 .../include/version/reverseproxy-version.xml.i     |   2 +-
 2 files changed, 132 insertions(+), 2 deletions(-)

(limited to 'interface-definitions/include')

diff --git a/interface-definitions/include/haproxy/logging.xml.i b/interface-definitions/include/haproxy/logging.xml.i
index e0af54fa4..315c959bf 100644
--- a/interface-definitions/include/haproxy/logging.xml.i
+++ b/interface-definitions/include/haproxy/logging.xml.i
@@ -4,7 +4,137 @@
     <help>Logging parameters</help>
   </properties>
   <children>
-    #include <include/syslog-facility.xml.i>
+    <tagNode name="facility">
+      <properties>
+        <help>Facility for logging</help>
+        <completionHelp>
+          <list>auth cron daemon kern lpr mail news syslog user uucp local0 local1 local2 local3 local4 local5 local6 local7</list>
+        </completionHelp>
+        <constraint>
+          <regex>(auth|cron|daemon|kern|lpr|mail|news|syslog|user|uucp|local0|local1|local2|local3|local4|local5|local6|local7)</regex>
+        </constraint>
+        <constraintErrorMessage>Invalid facility type</constraintErrorMessage>
+        <valueHelp>
+          <format>auth</format>
+          <description>Authentication and authorization</description>
+        </valueHelp>
+        <valueHelp>
+          <format>cron</format>
+          <description>Cron daemon</description>
+        </valueHelp>
+        <valueHelp>
+          <format>daemon</format>
+          <description>System daemons</description>
+        </valueHelp>
+        <valueHelp>
+          <format>kern</format>
+          <description>Kernel</description>
+        </valueHelp>
+        <valueHelp>
+          <format>lpr</format>
+          <description>Line printer spooler</description>
+        </valueHelp>
+        <valueHelp>
+          <format>mail</format>
+          <description>Mail subsystem</description>
+        </valueHelp>
+        <valueHelp>
+          <format>news</format>
+          <description>USENET subsystem</description>
+        </valueHelp>
+        <valueHelp>
+          <format>syslog</format>
+          <description>Authentication and authorization</description>
+        </valueHelp>
+        <valueHelp>
+          <format>user</format>
+          <description>Application processes</description>
+        </valueHelp>
+        <valueHelp>
+          <format>uucp</format>
+          <description>UUCP subsystem</description>
+        </valueHelp>
+        <valueHelp>
+          <format>local0</format>
+          <description>Local facility 0</description>
+        </valueHelp>
+        <valueHelp>
+          <format>local1</format>
+          <description>Local facility 1</description>
+        </valueHelp>
+        <valueHelp>
+          <format>local2</format>
+          <description>Local facility 2</description>
+        </valueHelp>
+        <valueHelp>
+          <format>local3</format>
+          <description>Local facility 3</description>
+        </valueHelp>
+        <valueHelp>
+          <format>local4</format>
+          <description>Local facility 4</description>
+        </valueHelp>
+        <valueHelp>
+          <format>local5</format>
+          <description>Local facility 5</description>
+        </valueHelp>
+        <valueHelp>
+          <format>local6</format>
+          <description>Local facility 6</description>
+        </valueHelp>
+        <valueHelp>
+          <format>local7</format>
+          <description>Local facility 7</description>
+        </valueHelp>
+      </properties>
+      <children>
+        <leafNode name="level">
+          <properties>
+            <help>Logging level</help>
+            <completionHelp>
+              <list>emerg alert crit err warning notice info debug</list>
+            </completionHelp>
+            <valueHelp>
+              <format>emerg</format>
+              <description>Emergency messages</description>
+            </valueHelp>
+            <valueHelp>
+              <format>alert</format>
+              <description>Urgent messages</description>
+            </valueHelp>
+            <valueHelp>
+              <format>crit</format>
+              <description>Critical messages</description>
+            </valueHelp>
+            <valueHelp>
+              <format>err</format>
+              <description>Error messages</description>
+            </valueHelp>
+            <valueHelp>
+              <format>warning</format>
+              <description>Warning messages</description>
+            </valueHelp>
+            <valueHelp>
+              <format>notice</format>
+              <description>Messages for further investigation</description>
+            </valueHelp>
+            <valueHelp>
+              <format>info</format>
+              <description>Informational messages</description>
+            </valueHelp>
+            <valueHelp>
+              <format>debug</format>
+              <description>Debug messages</description>
+            </valueHelp>
+            <constraint>
+              <regex>(emerg|alert|crit|err|warning|notice|info|debug)</regex>
+            </constraint>
+            <constraintErrorMessage>Invalid loglevel</constraintErrorMessage>
+          </properties>
+          <defaultValue>err</defaultValue>
+        </leafNode>
+      </children>
+    </tagNode>
   </children>
 </node>
 <!-- include end -->
diff --git a/interface-definitions/include/version/reverseproxy-version.xml.i b/interface-definitions/include/version/reverseproxy-version.xml.i
index 4f09f2848..71f7def1a 100644
--- a/interface-definitions/include/version/reverseproxy-version.xml.i
+++ b/interface-definitions/include/version/reverseproxy-version.xml.i
@@ -1,3 +1,3 @@
 <!-- include start from include/version/reverseproxy-version.xml.i -->
-<syntaxVersion component='reverse-proxy' version='2'></syntaxVersion>
+<syntaxVersion component='reverse-proxy' version='3'></syntaxVersion>
 <!-- include end -->
-- 
cgit v1.2.3