swanctl: Include config snippets from conf.d subdirectory

Fixes #2371.
This commit is contained in:
Tobias Brunner
2017-07-27 13:20:24 +02:00
parent fb8c9b3d08
commit ae48325a59
2 changed files with 3 additions and 0 deletions
+1
View File
@@ -64,6 +64,7 @@ maintainer-clean-local:
install-data-local: swanctl.conf install-data-local: swanctl.conf
test -e "$(DESTDIR)$(swanctldir)" || $(INSTALL) -d "$(DESTDIR)$(swanctldir)" || true 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)/x509" || $(INSTALL) -d "$(DESTDIR)$(swanctldir)/x509" || true
test -e "$(DESTDIR)$(swanctldir)/x509ca" || $(INSTALL) -d "$(DESTDIR)$(swanctldir)/x509ca" || true test -e "$(DESTDIR)$(swanctldir)/x509ca" || $(INSTALL) -d "$(DESTDIR)$(swanctldir)/x509ca" || true
test -e "$(DESTDIR)$(swanctldir)/x509aa" || $(INSTALL) -d "$(DESTDIR)$(swanctldir)/x509aa" || true test -e "$(DESTDIR)$(swanctldir)/x509aa" || $(INSTALL) -d "$(DESTDIR)$(swanctldir)/x509aa" || true
+2
View File
@@ -1158,3 +1158,5 @@ authorities.<name>.cert_uri_base =
built by appending the SHA1 hash of the DER encoded certificates to this built by appending the SHA1 hash of the DER encoded certificates to this
base URI. base URI.
include conf.d/*.conf
Include config snippets