conf: Install strongswan.conf template from a separate directory
authorTobias Brunner <tobias@strongswan.org>
Thu, 23 Jan 2014 13:38:03 +0000 (14:38 +0100)
committerTobias Brunner <tobias@strongswan.org>
Wed, 12 Feb 2014 13:34:33 +0000 (14:34 +0100)
Makefile.am
conf/Makefile.am [new file with mode: 0644]
conf/strongswan.conf [new file with mode: 0644]
configure.ac
src/Makefile.am
src/strongswan.conf [deleted file]

index 687d896..be32018 100644 (file)
@@ -1,4 +1,4 @@
-SUBDIRS = src man init testing
+SUBDIRS = src man conf init testing
 
 if USE_SCRIPTS
   SUBDIRS += scripts
diff --git a/conf/Makefile.am b/conf/Makefile.am
new file mode 100644 (file)
index 0000000..cbbb5b5
--- /dev/null
@@ -0,0 +1,5 @@
+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
diff --git a/conf/strongswan.conf b/conf/strongswan.conf
new file mode 100644 (file)
index 0000000..0d82ded
--- /dev/null
@@ -0,0 +1,34 @@
+# strongswan.conf - strongSwan configuration file
+
+charon {
+
+       # number of worker threads in charon
+       threads = 16
+
+       # send strongswan vendor ID?
+       # send_vendor_id = yes
+
+       plugins {
+
+               sql {
+                       # loglevel to log into sql database
+                       loglevel = -1
+
+                       # URI to the database
+                       # database = sqlite:///path/to/file.db
+                       # database = mysql://user:password@localhost/database
+               }
+       }
+
+       # ...
+}
+
+pluto {
+
+}
+
+libstrongswan {
+
+       #  set to no, the DH exponent size is optimized
+       #  dh_exponent_ansi_x9_42 = no
+}
index 76981e7..2eba4d5 100644 (file)
@@ -1368,6 +1368,7 @@ fi
 
 AC_CONFIG_FILES([
        Makefile
+       conf/Makefile
        man/Makefile
        init/Makefile
        init/systemd/Makefile
index f290d9c..7d11893 100644 (file)
@@ -119,9 +119,3 @@ endif
 if USE_INTEGRITY_TEST
   SUBDIRS += checksum
 endif
-
-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
diff --git a/src/strongswan.conf b/src/strongswan.conf
deleted file mode 100644 (file)
index 0d82ded..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-# strongswan.conf - strongSwan configuration file
-
-charon {
-
-       # number of worker threads in charon
-       threads = 16
-
-       # send strongswan vendor ID?
-       # send_vendor_id = yes
-
-       plugins {
-
-               sql {
-                       # loglevel to log into sql database
-                       loglevel = -1
-
-                       # URI to the database
-                       # database = sqlite:///path/to/file.db
-                       # database = mysql://user:password@localhost/database
-               }
-       }
-
-       # ...
-}
-
-pluto {
-
-}
-
-libstrongswan {
-
-       #  set to no, the DH exponent size is optimized
-       #  dh_exponent_ansi_x9_42 = no
-}