From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Thu, 15 Dec 2022 08:35:38 +0100 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1p5imH-004SN3-VQ for lore@lore.pengutronix.de; Thu, 15 Dec 2022 08:35:38 +0100 Received: from localhost ([127.0.0.1] helo=metis.ext.pengutronix.de) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1p5imG-0000rX-MJ; Thu, 15 Dec 2022 08:35:36 +0100 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1p5ila-0000LJ-Vs; Thu, 15 Dec 2022 08:34:55 +0100 Received: from [2a0a:edc0:0:1101:1d::54] (helo=dude05.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.94.2) (envelope-from ) id 1p5ilY-004eWO-Fj; Thu, 15 Dec 2022 08:34:53 +0100 Received: from mol by dude05.red.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1p5ilY-00AVXg-Di; Thu, 15 Dec 2022 08:34:52 +0100 From: Michael Olbrich To: ptxdist@pengutronix.de Date: Thu, 15 Dec 2022 08:34:52 +0100 Message-Id: <20221215073452.2504484-1-m.olbrich@pengutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221205085644.221422-1-lapeddk@gmail.com> References: <20221205085644.221422-1-lapeddk@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: Re: [ptxdist] [APPLIED] strongswan: Always install strongswan.d dir X-BeenThere: ptxdist@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Cc: Lars Pedersen Sender: "ptxdist" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false Thanks, applied as 4b88e91e28e84a77e55237b1c3f2053de9fa8869. Michael [sent from post-receive hook] On Thu, 15 Dec 2022 08:34:52 +0100, Lars Pedersen wrote: > The default strongswan.conf loads plugins via > strongswan.d/charon/*.conf files. > > Signed-off-by: Lars Pedersen > Message-Id: <20221205085644.221422-1-lapeddk@gmail.com> > Signed-off-by: Michael Olbrich > > diff --git a/rules/strongswan.make b/rules/strongswan.make > index 99f2fae74143..07a7ade73748 100644 > --- a/rules/strongswan.make > +++ b/rules/strongswan.make > @@ -312,7 +312,6 @@ endif > > ifdef PTXCONF_STRONGSWAN_SWANCTL > @$(call install_lib, strongswan, 0, 0, 0644, libvici) > - @$(call install_tree, strongswan, 0, 0, -, /etc/strongswan.d) > @$(call install_alternative, strongswan, 0, 0, 0644, /etc/swanctl/swanctl.conf) > @$(call install_copy, strongswan, 0, 0, 0750, /etc/swanctl/bliss) > @$(call install_copy, strongswan, 0, 0, 0750, /etc/swanctl/ecdsa) > @@ -329,6 +328,7 @@ ifdef PTXCONF_STRONGSWAN_SWANCTL > @$(call install_copy, strongswan, 0, 0, 0755, /etc/swanctl/x509ocsp) > endif > > + @$(call install_tree, strongswan, 0, 0, -, /etc/strongswan.d) > @$(call install_copy, strongswan, 0, 0, 0644, /etc/ipsec.d/aacerts) > @$(call install_copy, strongswan, 0, 0, 0644, /etc/ipsec.d/acerts) > @$(call install_copy, strongswan, 0, 0, 0644, /etc/ipsec.d/cacerts)