From: Tobias Brunner <tobias@strongswan.org>
Date: Thu, 23 Jan 2014 14:30:34 +0000 (+0100)
Subject: conf: Create /etc/strongswan.d directory and include .conf files
X-Git-Tag: 5.1.2rc1~7^2~25
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dee50a60468b294ade48d3ab11b5805c50833262;p=thirdparty%2Fstrongswan.git

conf: Create /etc/strongswan.d directory and include .conf files
---

diff --git a/conf/Makefile.am b/conf/Makefile.am
index cbbb5b57e4..7a5c263b10 100644
--- a/conf/Makefile.am
+++ b/conf/Makefile.am
@@ -3,3 +3,4 @@ EXTRA_DIST = strongswan.conf
 install-exec-local :
 		test -e "$(DESTDIR)${sysconfdir}" || $(INSTALL) -d "$(DESTDIR)$(sysconfdir)"
 		test -e "$(DESTDIR)$(sysconfdir)/strongswan.conf" || $(INSTALL) -m 640 $(srcdir)/strongswan.conf $(DESTDIR)$(sysconfdir)/strongswan.conf || true
+		test -e "$(DESTDIR)${sysconfdir}/strongswan.d" || $(INSTALL) -d "$(DESTDIR)$(sysconfdir)/strongswan.d"
diff --git a/conf/strongswan.conf b/conf/strongswan.conf
index daabaeb744..b2493e84f4 100644
--- a/conf/strongswan.conf
+++ b/conf/strongswan.conf
@@ -1,9 +1,13 @@
 # strongswan.conf - strongSwan configuration file
 #
 # Refer to the strongswan.conf(5) manpage for details
+#
+# Configuration changes should be made in the included files
 
 charon {
 	plugins {
 
 	}
 }
+
+include strongswan.d/*.conf