mailarchive of the ptxdist mailing list
 help / color / mirror / Atom feed
From: Michael Olbrich <m.olbrich@pengutronix.de>
To: ptxdist@pengutronix.de
Cc: Lars Pedersen <lapeddk@gmail.com>
Subject: Re: [ptxdist] [APPLIED] strongswan: Always install strongswan.d dir
Date: Thu, 15 Dec 2022 08:34:52 +0100	[thread overview]
Message-ID: <20221215073452.2504484-1-m.olbrich@pengutronix.de> (raw)
In-Reply-To: <20221205085644.221422-1-lapeddk@gmail.com>

Thanks, applied as 4b88e91e28e84a77e55237b1c3f2053de9fa8869.

Michael

[sent from post-receive hook]

On Thu, 15 Dec 2022 08:34:52 +0100, Lars Pedersen <lapeddk@gmail.com> wrote:
> The default strongswan.conf loads plugins via
> strongswan.d/charon/*.conf files.
> 
> Signed-off-by: Lars Pedersen <lapeddk@gmail.com>
> Message-Id: <20221205085644.221422-1-lapeddk@gmail.com>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> 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)



      parent reply	other threads:[~2022-12-15  7:35 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-12-05  8:56 [ptxdist] [PATCH 1/2] " Lars Pedersen
2022-12-05  8:56 ` [ptxdist] [PATCH 2/2] strongswan: version bump 5.9.6 -> 5.9.8 Lars Pedersen
2022-12-09  8:00   ` Michael Olbrich
2022-12-15  7:34 ` Michael Olbrich [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20221215073452.2504484-1-m.olbrich@pengutronix.de \
    --to=m.olbrich@pengutronix.de \
    --cc=lapeddk@gmail.com \
    --cc=ptxdist@pengutronix.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox