From nobody Sun Feb  8 10:50:07 2026
Delivered-To: importer@patchew.org
Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28
 as permitted sender) client-ip=209.132.183.28;
 envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com;
Authentication-Results: mx.zohomail.com;
	spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com;
	dmarc=pass(p=none dis=none)  header.from=redhat.com
ARC-Seal: i=1; a=rsa-sha256; t=1562861136; cv=none;
	d=zoho.com; s=zohoarc;
	b=atxp0nz60Qffa/gjoa0lnINZVRZ9x/H5XxrV364Ua/59+LcmVaAwoR9/01zZlb2w1G95unpzpPCljc2+qxPwbdwhMjulKkg448YmjfkdyoM/fGllF6gNJLrKkagN79FcJgt51sHxE/HjfE5+fU4trnPrwZGeSxKTlpfAjnz6qiM=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com;
 s=zohoarc;
	t=1562861136;
 h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results;
	bh=aTqCgDS/OzeiHvkoRD00zfJgp3i8u9po0RtVziIKoik=;
	b=mpdiigH1jQJjal0FCeGzFsDQdnOOubw8IB/7H7KmXqTrySkqJDQIijCE+fOxd4c43a9Jfvc7r8O+YQk4GrRg8IZ2FLn6ZmusP+oL7o/pw6NZ3w0AhOvI6fq7/KVRvHulTXIcHngY2VhFfThbvy+oBduYVuiwA5I/33r3bo0zPKQ=
ARC-Authentication-Results: i=1; mx.zoho.com;
	spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com;
	dmarc=pass header.from=<berrange@redhat.com> (p=none dis=none)
 header.from=<berrange@redhat.com>
Return-Path: <libvir-list-bounces@redhat.com>
Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by
 mx.zohomail.com
	with SMTPS id 1562861136681264.520122354249;
 Thu, 11 Jul 2019 09:05:36 -0700 (PDT)
Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com
 [10.5.11.13])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mx1.redhat.com (Postfix) with ESMTPS id F3C832EED1F;
	Thu, 11 Jul 2019 16:05:34 +0000 (UTC)
Received: from colo-mx.corp.redhat.com
 (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21])
	by smtp.corp.redhat.com (Postfix) with ESMTPS id C342B60610;
	Thu, 11 Jul 2019 16:05:34 +0000 (UTC)
Received: from lists01.pubmisc.prod.ext.phx2.redhat.com
 (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33])
	by colo-mx.corp.redhat.com (Postfix) with ESMTP id 7970B206D6;
	Thu, 11 Jul 2019 16:05:34 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com
	[10.5.11.14])
	by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP
	id x6BG5R5U020377 for <libvir-list@listman.util.phx.redhat.com>;
	Thu, 11 Jul 2019 12:05:27 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id A074F5DD65; Thu, 11 Jul 2019 16:05:27 +0000 (UTC)
Received: from dhcp-17-95.lcy.redhat.com (unknown [10.42.17.95])
	by smtp.corp.redhat.com (Postfix) with ESMTP id 1B7595D9CC;
	Thu, 11 Jul 2019 16:05:26 +0000 (UTC)
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
To: libvir-list@redhat.com
Date: Thu, 11 Jul 2019 17:04:56 +0100
Message-Id: <20190711160516.2130-10-berrange@redhat.com>
In-Reply-To: <20190711160516.2130-1-berrange@redhat.com>
References: <20190711160516.2130-1-berrange@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14
X-loop: libvir-list@redhat.com
Subject: [libvirt] [PATCH 09/29] remote: conditionalize IP socket config in
	augeas definitions
X-BeenThere: libvir-list@redhat.com
X-Mailman-Version: 2.1.12
Precedence: junk
List-Id: Development discussions about the libvirt library & tools
	<libvir-list.redhat.com>
List-Unsubscribe: <https://www.redhat.com/mailman/options/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=unsubscribe>
List-Archive: <https://www.redhat.com/archives/libvir-list>
List-Post: <mailto:libvir-list@redhat.com>
List-Help: <mailto:libvir-list-request@redhat.com?subject=help>
List-Subscribe: <https://www.redhat.com/mailman/listinfo/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=subscribe>
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
Sender: libvir-list-bounces@redhat.com
Errors-To: libvir-list-bounces@redhat.com
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13
X-Greylist: Sender IP whitelisted,
 not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]);
 Thu, 11 Jul 2019 16:05:35 +0000 (UTC)

Prepare for reusing libvirtd augeas defintions with other daemons by
making the config parameters for IP sockets conditionally defined by
the make rules.

Signed-off-by: Daniel P. Berrang=C3=A9 <berrange@redhat.com>
---
 build-aux/augeas-gentest.pl                  |  2 +-
 src/remote/Makefile.inc.am                   | 27 +++++++++++++++-----
 src/remote/{libvirtd.aug =3D> libvirtd.aug.in} | 24 ++++++++++++-----
 src/remote/test_libvirtd.aug.in              | 14 +++++++---
 4 files changed, 49 insertions(+), 18 deletions(-)
 rename src/remote/{libvirtd.aug =3D> libvirtd.aug.in} (88%)

diff --git a/build-aux/augeas-gentest.pl b/build-aux/augeas-gentest.pl
index 567fc651f3..69d94e6a0f 100755
--- a/build-aux/augeas-gentest.pl
+++ b/build-aux/augeas-gentest.pl
@@ -37,7 +37,7 @@ open TEMPLATE, "<", $template or die "cannot read $templa=
te: $!";
=20
 my $group =3D 0;
 while (<TEMPLATE>) {
-    if (/::CONFIG::/) {
+    if (/::\s*CONFIG\s*::/) {
         my $group =3D 0;
         print AUGTEST "  let conf =3D \"";
         while (<CONFIG>) {
diff --git a/src/remote/Makefile.inc.am b/src/remote/Makefile.inc.am
index 4bc71346f2..7732fa744c 100644
--- a/src/remote/Makefile.inc.am
+++ b/src/remote/Makefile.inc.am
@@ -124,11 +124,11 @@ sbin_PROGRAMS +=3D libvirtd
=20
 augeas_DATA +=3D remote/libvirtd.aug
=20
-augeastest_DATA +=3D test_libvirtd.aug
+augeastest_DATA +=3D remote/test_libvirtd.aug
=20
 conf_DATA +=3D remote/libvirtd.conf
=20
-CLEANFILES +=3D test_libvirtd.aug
+CLEANFILES +=3D remote/libvirtd.aug remote/test_libvirtd.aug
=20
 man8_MANS +=3D libvirtd.8
=20
@@ -198,13 +198,28 @@ uninstall-data-remote:
=20
 AUGEAS_DIRS +=3D remote
=20
-test_libvirtd.aug: remote/test_libvirtd.aug.in \
+remote/libvirtd.aug: remote/libvirtd.aug.in
+	$(AM_V_GEN)$(SED) \
+		-e '/:: CUT ENABLE_IP ::/d' \
+		-e '/:: END ::/d' \
+		-e 's/:: DAEMON_NAME ::/libvirtd/' \
+		-e 's/:: DAEMON_NAME_UC ::/Libvirtd/' \
+		$< > $@
+
+remote/test_libvirtd.aug.tmp: remote/test_libvirtd.aug.in \
 		remote/libvirtd.conf $(AUG_GENTEST)
-	$(AM_V_GEN)$(AUG_GENTEST) $(srcdir)/remote/libvirtd.conf $< $@
+	$(AM_V_GEN)$(AUG_GENTEST) remote/libvirtd.conf remote/test_libvirtd.aug.i=
n $@
+
+remote/test_libvirtd.aug: remote/test_libvirtd.aug.tmp
+	$(AM_V_GEN)$(SED) -e '/:: CUT ENABLE_IP ::/d' \
+		-e '/:: END ::/d' \
+		-e 's/:: DAEMON_NAME ::/libvirtd/' \
+		-e 's/:: DAEMON_NAME_UC ::/Libvirtd/' \
+		< $^ > $@ || rm -f $@
=20
-check-augeas-remote: test_libvirtd.aug
+check-augeas-remote: remote/test_libvirtd.aug
 	$(AM_V_GEN)if test -x '$(AUGPARSE)'; then \
-	    '$(AUGPARSE)' -I $(srcdir)/remote test_libvirtd.aug; \
+	    '$(AUGPARSE)' -I $(srcdir)/remote remote/test_libvirtd.aug; \
 	fi
=20
 if WITH_SYSCTL
diff --git a/src/remote/libvirtd.aug b/src/remote/libvirtd.aug.in
similarity index 88%
rename from src/remote/libvirtd.aug
rename to src/remote/libvirtd.aug.in
index 0188c23dd7..54a45e438a 100644
--- a/src/remote/libvirtd.aug
+++ b/src/remote/libvirtd.aug.in
@@ -1,6 +1,6 @@
-(* /etc/libvirt/libvirtd.conf *)
+(* /etc/libvirt/:: DAEMON_NAME ::.conf *)
=20
-module Libvirtd =3D
+module :: DAEMON_NAME_UC :: =3D
    autoload xfm
=20
    let eol   =3D del /[ \t]*\n/ "\n"
@@ -24,11 +24,13 @@ module Libvirtd =3D
=20
=20
    (* Config entry grouped by function - same order as example config *)
+:: CUT ENABLE_IP ::
    let network_entry =3D bool_entry "listen_tls"
                      | bool_entry "listen_tcp"
                      | str_entry "tls_port"
                      | str_entry "tcp_port"
                      | str_entry "listen_addr"
+:: END::
=20
    let sock_acl_entry =3D str_entry "unix_sock_group"
                       | str_entry "unix_sock_ro_perms"
@@ -38,6 +40,7 @@ module Libvirtd =3D
=20
    let authentication_entry =3D str_entry "auth_unix_ro"
                             | str_entry "auth_unix_rw"
+:: CUT ENABLE_IP ::
                             | str_entry "auth_tcp"
                             | str_entry "auth_tls"
=20
@@ -46,12 +49,16 @@ module Libvirtd =3D
                          | str_entry "ca_file"
                          | str_entry "crl_file"
=20
-   let authorization_entry =3D bool_entry "tls_no_verify_certificate"
+   let tls_authorization_entry =3D bool_entry "tls_no_verify_certificate"
                            | bool_entry "tls_no_sanity_certificate"
                            | str_array_entry "tls_allowed_dn_list"
                            | str_array_entry "sasl_allowed_username_list"
                            | str_array_entry "access_drivers"
                            | str_entry "tls_priority"
+:: END ::
+
+   let misc_authorization_entry =3D str_array_entry "sasl_allowed_username=
_list"
+                           | str_array_entry "access_drivers"
=20
    let processing_entry =3D int_entry "min_workers"
                         | int_entry "max_workers"
@@ -87,11 +94,14 @@ module Libvirtd =3D
                   | int_entry "ovs_timeout"
=20
    (* Each enty in the config is one of the following three ... *)
-   let entry =3D network_entry
-             | sock_acl_entry
+   let entry =3D sock_acl_entry
              | authentication_entry
+:: CUT ENABLE_IP ::
+             | network_entry
              | certificate_entry
-             | authorization_entry
+             | tls_authorization_entry
+:: END ::
+             | misc_authorization_entry
              | processing_entry
              | admin_processing_entry
              | logging_entry
@@ -106,7 +116,7 @@ module Libvirtd =3D
=20
    let lns =3D ( record | comment | empty ) *
=20
-   let filter =3D incl "/etc/libvirt/libvirtd.conf"
+   let filter =3D incl "/etc/libvirt/:: DAEMON_NAME ::.conf"
               . Util.stdexcl
=20
    let xfm =3D transform lns filter
diff --git a/src/remote/test_libvirtd.aug.in b/src/remote/test_libvirtd.aug=
.in
index a4c7b4afe8..ac3e0493b6 100644
--- a/src/remote/test_libvirtd.aug.in
+++ b/src/remote/test_libvirtd.aug.in
@@ -1,12 +1,14 @@
-module Test_libvirtd =3D
-   ::CONFIG::
+module Test_:: DAEMON_NAME :: =3D
+   :: CONFIG ::
=20
-   test Libvirtd.lns get conf =3D
+   test :: DAEMON_NAME_UC ::.lns get conf =3D
+:: CUT ENABLE_IP ::
         { "listen_tls" =3D "0" }
         { "listen_tcp" =3D "1" }
         { "tls_port" =3D "16514" }
         { "tcp_port" =3D "16509" }
         { "listen_addr" =3D "192.168.0.1" }
+:: END ::
         { "unix_sock_group" =3D "libvirt" }
         { "unix_sock_ro_perms" =3D "0777" }
         { "unix_sock_rw_perms" =3D "0770" }
@@ -14,11 +16,14 @@ module Test_libvirtd =3D
         { "unix_sock_dir" =3D "/var/run/libvirt" }
         { "auth_unix_ro" =3D "none" }
         { "auth_unix_rw" =3D "none" }
+:: CUT ENABLE_IP ::
         { "auth_tcp" =3D "sasl" }
         { "auth_tls" =3D "none" }
+:: END ::
         { "access_drivers"
              { "1" =3D "polkit" }
         }
+:: CUT ENABLE_IP ::
         { "key_file" =3D "/etc/pki/libvirt/private/serverkey.pem" }
         { "cert_file" =3D "/etc/pki/libvirt/servercert.pem" }
         { "ca_file" =3D "/etc/pki/CA/cacert.pem" }
@@ -30,6 +35,7 @@ module Test_libvirtd =3D
              { "2" =3D "DN2"}
         }
         { "tls_priority" =3D "NORMAL" }
+:: END ::
         { "sasl_allowed_username_list"
              { "1" =3D "joe@EXAMPLE.COM" }
              { "2" =3D "fred@EXAMPLE.COM" }
@@ -48,7 +54,7 @@ module Test_libvirtd =3D
         { "admin_max_client_requests" =3D "5" }
         { "log_level" =3D "3" }
         { "log_filters" =3D "1:qemu 1:libvirt 4:object 4:json 4:event 1:ut=
il" }
-        { "log_outputs" =3D "3:syslog:libvirtd" }
+        { "log_outputs" =3D "3:syslog::: DAEMON_NAME ::" }
         { "audit_level" =3D "2" }
         { "audit_logging" =3D "1" }
         { "host_uuid" =3D "00000000-0000-0000-0000-000000000000" }
--=20
2.21.0

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list