swanctl: Include config snippets from conf.d subdirectory

Fixes #2371.

diff --git a/src/swanctl/Makefile.am b/src/swanctl/Makefile.am
index 2fc998262b034efb1a88c69736ed45c3bb49104c..19815c51adbf397d692708e2c30c3586b2d8d431 100644 (file)
--- a/src/swanctl/Makefile.am
+++ b/src/swanctl/Makefile.am
@@ -64,6 +64,7 @@ maintainer-clean-local:
 
 install-data-local: swanctl.conf
        test -e "$(DESTDIR)$(swanctldir)" || $(INSTALL) -d "$(DESTDIR)$(swanctldir)" || true
+       test -e "$(DESTDIR)$(swanctldir)/conf.d" || $(INSTALL) -d "$(DESTDIR)$(swanctldir)/conf.d" || true
        test -e "$(DESTDIR)$(swanctldir)/x509" || $(INSTALL) -d "$(DESTDIR)$(swanctldir)/x509" || true
        test -e "$(DESTDIR)$(swanctldir)/x509ca" || $(INSTALL) -d "$(DESTDIR)$(swanctldir)/x509ca" || true
        test -e "$(DESTDIR)$(swanctldir)/x509aa" || $(INSTALL) -d "$(DESTDIR)$(swanctldir)/x509aa" || true

diff --git a/src/swanctl/swanctl.opt b/src/swanctl/swanctl.opt
index a36e837df4454cf229b0ecb79d28fd16b7f7c9f0..634271d26467847751d914ecb8637d3eea1aa565 100644 (file)
--- a/src/swanctl/swanctl.opt
+++ b/src/swanctl/swanctl.opt
@@ -1158,3 +1158,5 @@ authorities.<name>.cert_uri_base =
        built by appending the SHA1 hash of the DER encoded certificates to this
        base URI.
 
+include conf.d/*.conf
+       Include config snippets