aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--conf/Makefile.am1
-rw-r--r--conf/strongswan.conf4
2 files changed, 5 insertions, 0 deletions
diff --git a/conf/Makefile.am b/conf/Makefile.am
index cbbb5b57e..7a5c263b1 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 daabaeb74..b2493e84f 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