summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog7
-rwxr-xr-xdebian/openvpn-generator11
2 files changed, 0 insertions, 18 deletions
diff --git a/debian/changelog b/debian/changelog
index 989a4b4..7f4b2a4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,3 @@
-openvpn (2.4.6-2) UNRELEASED; urgency=medium
-
- * debian/openvpn-generator:
- - Use service file from /etc/systemd/system if exists (Closes: #905392).
-
- -- Jörg Frings-Fürst <debian@jff.email> Sat, 04 Aug 2018 15:14:58 +0200
-
openvpn (2.4.6-1) unstable; urgency=medium
[ Jörg Frings-Fürst ]
diff --git a/debian/openvpn-generator b/debian/openvpn-generator
index b51344f..d6ac1aa 100755
--- a/debian/openvpn-generator
+++ b/debian/openvpn-generator
@@ -4,27 +4,16 @@
# tunnels listed in /etc/default/openvpn's AUTOSTART be started/stopped/reloaded
# when openvpn.service is started/stopped/reloaded.
-#
-# Changelog:
-#
-# 2018-08-04 jff use service file from /etc/systemd/system if exists.
-#
-
set -eu
GENDIR="$1"
WANTDIR="$1/openvpn.service.wants"
SERVICEFILE="/lib/systemd/system/openvpn@.service"
-SERVICEFILEMAN="/etc/systemd/system/openvpn@.service"
AUTOSTART="all"
CONFIG_DIR=/etc/openvpn
mkdir -p "$WANTDIR"
-if test -e ${SERVICEFILEMAN} ; then
- SERVICEFILE=${SERVICEFILEMAN}
-fi
-
if test -e /etc/default/openvpn ; then
. /etc/default/openvpn
fi