Project

General

Profile

Feature #2371

Include ‘/etc/swanctl/conf.d/*.conf’ from ‘/etc/swanctl/swanctl.conf’

Added by Gerald Turner almost 3 years ago. Updated over 2 years ago.

Status:
Closed
Priority:
Normal
Assignee:
Tobias Brunner
Category:
swanctl
Target version:
5.6.0
Start date:
28.06.2017
Due date:
Estimated time:
Resolution:
Fixed

Description

I use strongSwan from Debian packages on several hosts and the /etc/strongswan.d/*.conf split change that was introduced several years ago has been very convenient, as dpkg treats files like /etc/strongswan.conf as a conffile which requires manual intervention during package upgrades when dpkg detects that these files had been locally modified by the administrator.

I recently made the jump from strongswan-starter (charon/stroke) to strongswan-swanctl (charon-systemd/swanctl). It would be nice if swanctl had the same sort of include conf.d/*.conf split.

Attached is a minor patch which changes /etc/swanctl/swanctl.conf to include /etc/swanctl/conf.d/*.conf.

I've reported this as Debug bug #866326.

06_include-swanctl-conf-d-dir.patch (945 Bytes) 06_include-swanctl-conf-d-dir.patch Gerald Turner, 29.06.2017 00:48

Associated revisions

Revision ae48325a (diff)
Added by Tobias Brunner over 2 years ago

swanctl: Include config snippets from conf.d subdirectory

Fixes #2371.

History

#1 Updated by Tobias Brunner almost 3 years ago

  • Status changed from New to Feedback
  • Assignee set to Tobias Brunner
  • Target version set to 5.6.0

I agree with the general idea, but swanctl.conf is generated from the swanctl.opt file. So your patch does not apply. I pushed a couple of patches to the 2371-swanctl-include branch that implement this.

#2 Updated by Gerald Turner almost 3 years ago

Tobias Brunner wrote:

I agree with the general idea, but swanctl.conf is generated from the swanctl.opt file. So your patch does not apply.

Sorry, I hadn't realized swanctl.conf was generated. My patch was somehow magically sufficient when applied to Debian's packaging.

I pushed a couple of patches to the 2371-swanctl-include branch that implement this.

I tested the 2371-swanctl-include branch and it works great, thanks!

#3 Updated by Tobias Brunner almost 3 years ago

My patch was somehow magically sufficient when applied to Debian's packaging.

Yes, the generated file is part of the tarball.

I pushed a couple of patches to the 2371-swanctl-include branch that implement this.

I tested the 2371-swanctl-include branch and it works great, thanks!

Thanks for testing.

#4 Updated by Tobias Brunner over 2 years ago

  • Status changed from Feedback to Closed
  • Resolution set to Fixed

Also available in: Atom PDF