diff options
| author | Raphael Geissert <geissert@debian.org> | 2014-01-14 14:51:01 +0100 |
|---|---|---|
| committer | Yves-Alexis Perez <corsac@debian.org> | 2014-01-17 12:42:41 +0100 |
| commit | 0080830d0419f8ca8cbe6b20df89b81ed0e2228d (patch) | |
| tree | 85ea0700a606fab6a419371e87c01ad52b88b9f4 | |
| parent | f9f82c46d2308d94f8cccccf680563f790aa33c9 (diff) | |
| download | vyos-strongswan-0080830d0419f8ca8cbe6b20df89b81ed0e2228d.tar.gz vyos-strongswan-0080830d0419f8ca8cbe6b20df89b81ed0e2228d.zip | |
Support configuration via /etc/strongswan.conf.d/
Upstream's position on this is that packages should ship this
configuration, instead of modifying it upstream. See:
https://wiki.strongswan.org/issues/475
| -rw-r--r-- | debian/changelog | 4 | ||||
| -rw-r--r-- | debian/libstrongswan.dirs | 1 | ||||
| -rw-r--r-- | debian/patches/02_include-strongswan.conf.d.patch | 10 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
4 files changed, 16 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index e7368a04c..8d3660630 100644 --- a/debian/changelog +++ b/debian/changelog @@ -49,6 +49,10 @@ strongswan (5.1.1-1) UNRELEASED; urgency=low * debian/strongswan-starter.install: - 'ipsec pool' is no longer built, remove. + [ Raphael Geissert ] + * Allow the configuration of strongswan.conf to be stored in snippets + in /etc/strongswan.conf.d/ + -- Romain Francoise <rfrancoise@debian.org> Tue, 29 Oct 2013 20:01:37 +0100 strongswan (5.1.0-3) unstable; urgency=high diff --git a/debian/libstrongswan.dirs b/debian/libstrongswan.dirs index 3550fea6f..ed957af66 100644 --- a/debian/libstrongswan.dirs +++ b/debian/libstrongswan.dirs @@ -2,5 +2,6 @@ /etc/logcheck/ignore.d.server /etc/logcheck/ignore.d.workstation /etc/logcheck/violations.ignore.d +/etc/strongswan.conf.d /usr/share/lintian/overrides /usr/lib/ipsec/plugins diff --git a/debian/patches/02_include-strongswan.conf.d.patch b/debian/patches/02_include-strongswan.conf.d.patch new file mode 100644 index 000000000..45d95fbac --- /dev/null +++ b/debian/patches/02_include-strongswan.conf.d.patch @@ -0,0 +1,10 @@ +Index: strongswan/src/strongswan.conf +=================================================================== +--- strongswan.orig/src/strongswan.conf 2014-01-14 13:45:31.898298701 +0100 ++++ strongswan/src/strongswan.conf 2014-01-14 14:43:30.936346911 +0100 +@@ -32,3 +32,5 @@ + # set to no, the DH exponent size is optimized + # dh_exponent_ansi_x9_42 = no + } ++ ++include /etc/strongswan.conf.d/*.conf diff --git a/debian/patches/series b/debian/patches/series index 2cf256b6c..a004656ee 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ 01_fix-manpages.patch +02_include-strongswan.conf.d.patch |