Gert Doering has submitted this change. (
https://gerrit.openvpn.net/c/openvpn/+/2186?usp=email )
Change subject: contrib, sample: drop SysV-era init scripts
......................................................................
contrib, sample: drop SysV-era init scripts
multilevel-init.patch patches the init script removed in 57ec6cec
("cleanup: Remove RPM openvpn.spec build approach").
openvpn-startup.sh and openvpn-shutdown.sh are superseded by the
systemd units in distro/systemd.
Change-Id: Icb79564ae4e0df1dcdd4a3734bd45f9513f56111
Signed-off-by: Razvan Cojocaru <[email protected]>
Acked-by: Gert Doering <[email protected]>
Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/2186
Message-Id: <[email protected]>
URL:
https://www.mail-archive.com/[email protected]/msg41407.html
Signed-off-by: Gert Doering <[email protected]>
---
D contrib/multilevel-init.patch
D sample/sample-config-files/openvpn-shutdown.sh
D sample/sample-config-files/openvpn-startup.sh
3 files changed, 0 insertions(+), 118 deletions(-)
diff --git a/contrib/multilevel-init.patch b/contrib/multilevel-init.patch
deleted file mode 100644
index 8d48fbc..0000000
--- a/contrib/multilevel-init.patch
+++ /dev/null
@@ -1,79 +0,0 @@
---- /etc/init.d/openvpn 2004-05-12 20:30:06.000000000 +0200
-+++ openvpn 2004-05-12 20:34:33.000000000 +0200
-@@ -58,13 +58,13 @@
- # returning success or failure status to caller (James Yonan).
-
- # Location of openvpn binary
--openvpn="/usr/sbin/openvpn"
-+openvpn=/usr/sbin/openvpn
-
- # Lockfile
--lock="/var/lock/subsys/openvpn"
-+lock=/var/lock/subsys/openvpn
-
- # PID directory
--piddir="/var/run/openvpn"
-+piddir=/var/run/openvpn
-
- # Our working directory
- work=/etc/openvpn
-@@ -106,7 +106,7 @@
-
- if [ -f $lock ]; then
- # we were not shut down correctly
-- for pidf in `/bin/ls $piddir/*.pid $piddir/*/*.pid 2>/dev/null`; do
-+ for pidf in `find $piddir -name "*.pid" 2>/dev/null`; do
- if [ -s $pidf ]; then
- kill `cat $pidf` >/dev/null 2>&1
- fi
-@@ -116,12 +116,12 @@
- sleep 2
- fi
-
-- rm -f $piddir/*.pid $piddir/*/*.pid
-+ find $piddir -name "*.pid"|xargs rm -f
-
- # Start every .conf in $work and run .sh if exists
- errors=0
- successes=0
-- for c in `/bin/ls *.conf */*.conf 2>/dev/null`; do
-+ for c in `find * -name "*.conf" 2>/dev/null`; do
- bn=${c%%.conf}
- if [ -f "$bn.sh" ]; then
- . $bn.sh
-@@ -147,7 +147,7 @@
- ;;
- stop)
- echo -n $"Shutting down openvpn: "
-- for pidf in `/bin/ls $piddir/*.pid $piddir/*/*.pid 2>/dev/null`; do
-+ for pidf in `find $piddir -name "*.pid" 2>/dev/null`; do
- if [ -s $pidf ]; then
- kill `cat $pidf` >/dev/null 2>&1
- fi
-@@ -163,7 +163,7 @@
- ;;
- reload)
- if [ -f $lock ]; then
-- for pidf in `/bin/ls $piddir/*.pid $piddir/*/*.pid 2>/dev/null`; do
-+ for pidf in `find $piddir -name "*.pid" 2>/dev/null`; do
- if [ -s $pidf ]; then
- kill -HUP `cat $pidf` >/dev/null 2>&1
- fi
-@@ -175,7 +175,7 @@
- ;;
- reopen)
- if [ -f $lock ]; then
-- for pidf in `/bin/ls $piddir/*.pid $piddir/*/*.pid 2>/dev/null`; do
-+ for pidf in `find $piddir -name "*.pid" 2>/dev/null`; do
- if [ -s $pidf ]; then
- kill -USR1 `cat $pidf` >/dev/null 2>&1
- fi
-@@ -195,7 +195,7 @@
- ;;
- status)
- if [ -f $lock ]; then
-- for pidf in `/bin/ls $piddir/*.pid $piddir/*/*.pid 2>/dev/null`; do
-+ for pidf in `find $piddir -name "*.pid" 2>/dev/null`; do
- if [ -s $pidf ]; then
- kill -USR2 `cat $pidf` >/dev/null 2>&1
- fi
diff --git a/sample/sample-config-files/openvpn-shutdown.sh
b/sample/sample-config-files/openvpn-shutdown.sh
deleted file mode 100755
index 8ed2d1d..0000000
--- a/sample/sample-config-files/openvpn-shutdown.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-# stop all openvpn processes
-
-killall -TERM openvpn
diff --git a/sample/sample-config-files/openvpn-startup.sh
b/sample/sample-config-files/openvpn-startup.sh
deleted file mode 100755
index 0ee006b..0000000
--- a/sample/sample-config-files/openvpn-startup.sh
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/sh
-
-# A sample OpenVPN startup script
-# for Linux.
-
-# openvpn config file directory
-dir=/etc/openvpn
-
-# load the firewall
-$dir/firewall.sh
-
-# load TUN/TAP kernel module
-modprobe tun
-
-# enable IP forwarding
-echo 1 > /proc/sys/net/ipv4/ip_forward
-
-# Invoke openvpn for each VPN tunnel
-# in daemon mode. Alternatively,
-# you could remove "--daemon" from
-# the command line and add "daemon"
-# to the config file.
-#
-# Each tunnel should run on a separate
-# UDP port. Use the "port" option
-# to control this. Like all of
-# OpenVPN's options, you can
-# specify "--port 8000" on the command
-# line or "port 8000" in the config
-# file.
-
-openvpn --cd $dir --daemon --config vpn1.conf
-openvpn --cd $dir --daemon --config vpn2.conf
-openvpn --cd $dir --daemon --config vpn2.conf
--
To view, visit https://gerrit.openvpn.net/c/openvpn/+/2186?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.openvpn.net/settings?usp=email
Gerrit-MessageType: merged
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Icb79564ae4e0df1dcdd4a3734bd45f9513f56111
Gerrit-Change-Number: 2186
Gerrit-PatchSet: 2
Gerrit-Owner: Răzvan Cojocaru <[email protected]>
Gerrit-Reviewer: Arne Schwabe <[email protected]>
Gerrit-Reviewer: Gert Doering <[email protected]>
Gerrit-CC: openvpn-devel <[email protected]>
_______________________________________________
Openvpn-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openvpn-devel