[openggsn] 01/01: Don't include init-file. It just makes things unnecessarily complicated. Install configuration files in /etc/

Ruben Undheim rubund-guest at moszumanska.debian.org
Fri Feb 5 21:49:38 UTC 2016


This is an automated email from the git hooks/post-receive script.

rubund-guest pushed a commit to branch master
in repository openggsn.

commit 408d95d42d196d5bed51fe1649eb1c3697fe7d53
Author: Ruben Undheim <ruben.undheim at gmail.com>
Date:   Fri Feb 5 22:45:33 2016 +0100

    Don't include init-file. It just makes things unnecessarily complicated.
    Install configuration files in /etc/
---
 debian/openggsn.README.Debian |   7 +-
 debian/openggsn.examples      |   2 -
 debian/openggsn.init          | 163 ------------------------------------------
 debian/openggsn.install       |   2 +
 4 files changed, 4 insertions(+), 170 deletions(-)

diff --git a/debian/openggsn.README.Debian b/debian/openggsn.README.Debian
index 6e6c131..27e1e87 100644
--- a/debian/openggsn.README.Debian
+++ b/debian/openggsn.README.Debian
@@ -1,8 +1,5 @@
 openggsn for Debian
 -------------------
 
- This package contains "ggsn" and "sgsnemu". "/etc/init.d/openggsn" is the init
- script for ggsn, not for sgsnemu which does not need an init script.  If you
- want to run ggsn, you should create "/etc/ggsn.conf" first. There's an example
- configuration file in /usr/share/doc/openggsn/examples/ggsn.conf which can be
- used as as starting point.
+ This package contains "ggsn" and "sgsnemu". They use the configuration files
+ /etc/ggsn.conf and /etc/sgsnemu.conf respectively.
diff --git a/debian/openggsn.examples b/debian/openggsn.examples
index b2255cc..96037c8 100644
--- a/debian/openggsn.examples
+++ b/debian/openggsn.examples
@@ -1,3 +1 @@
-examples/ggsn.conf
-examples/sgsnemu.conf
 examples/firewall
diff --git a/debian/openggsn.init b/debian/openggsn.init
deleted file mode 100755
index d4fcb18..0000000
--- a/debian/openggsn.init
+++ /dev/null
@@ -1,163 +0,0 @@
-#!/bin/sh
-### BEGIN INIT INFO
-# Provides:          openggsn
-# Required-Start:    $network $local_fs $remote_fs
-# Required-Stop:     $network $remote_fs
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description: Gateway GPRS Support Node
-# Description:       Gateway GPRS Support Node
-### END INIT INFO
-
-# Author: Harald Welte <laforge at gnumonks.org>
-
-# PATH should only include /usr/* if it runs after the mountnfs.sh script
-PATH=/sbin:/usr/sbin:/bin:/usr/bin
-DESC="OpenGGSN Gateway GPRS Support Node"
-NAME=ggsn
-DAEMON=/usr/bin/ggsn
-DAEMON_ARGS=""             # Arguments to run the daemon with
-PIDFILE=/var/run/$NAME.pid
-SCRIPTNAME=/etc/init.d/openggsn
-
-# Exit if the package is not installed
-[ -x $DAEMON ] || exit 0
-
-# Read configuration variable file if it is present
-[ -r /etc/default/openggsn ] && . /etc/default/openggsn
-
-# Load the VERBOSE setting and other rcS variables
-. /lib/init/vars.sh
-# Depend on lsb-base (>= 3.0-6) to ensure that this file is present.
-. /lib/lsb/init-functions
-
-DAEMON_ARGS="$DAEMON_ARGS"
-
-#
-# Function that starts the daemon/service
-#
-do_start()
-{
-	# Return
-	#   0 if daemon has been started
-	#   1 if daemon was already running
-	#   2 if daemon could not be started
-	start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON --test > /dev/null \
-		|| return 1
-
-	# Check for runtime directory of nonvolatile data
-	if [ ! -d /var/lib/ggsn ]; then
-		mkdir /var/lib/ggsn
-	fi
-
-	# Check for GTP restart counter
-	if [ ! -f /var/lib/ggsn/gsn_restart ]; then
-		echo 0 > /var/lib/ggsn/gsn_restart
-	fi
-
-	start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON -- \
-		$DAEMON_ARGS \
-		|| return 2
-	# Add code here, if necessary, that waits for the process to be ready
-	# to handle requests from services started subsequently which depend
-	# on this one.  As a last resort, sleep for some time.
-}
-
-#
-# Function that stops the daemon/service
-#
-do_stop()
-{
-	# Return
-	#   0 if daemon has been stopped
-	#   1 if daemon was already stopped
-	#   2 if daemon could not be stopped
-	#   other if a failure occurred
-	start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE --name $NAME
-	RETVAL="$?"
-	[ "$RETVAL" = 2 ] && return 2
-	# Wait for children to finish too if this is a daemon that forks
-	# and if the daemon is only ever run from this initscript.
-	# If the above conditions are not satisfied then add some other code
-	# that waits for the process to drop all resources that could be
-	# needed by services started subsequently.  A last resort is to
-	# sleep for some time.
-	start-stop-daemon --stop --quiet --oknodo --retry=0/30/KILL/5 --exec $DAEMON
-	[ "$?" = 2 ] && return 2
-	# Many daemons don't delete their pidfiles when they exit.
-	rm -f $PIDFILE
-	return "$RETVAL"
-}
-
-#
-# Function that sends a SIGHUP to the daemon/service
-#
-do_reload() {
-	#
-	# If the daemon can reload its configuration without
-	# restarting (for example, when it is sent a SIGHUP),
-	# then implement that here.
-	#
-	start-stop-daemon --stop --signal 1 --quiet --pidfile $PIDFILE --name $NAME
-	return 0
-}
-
-case "$1" in
-  start)
-    [ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC " "$NAME"
-    do_start
-    case "$?" in
-		0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
-		2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
-	esac
-  ;;
-  stop)
-	[ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME"
-	do_stop
-	case "$?" in
-		0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
-		2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
-	esac
-	;;
-  status)
-       status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $?
-       ;;
-  #reload|force-reload)
-	#
-	# If do_reload() is not implemented then leave this commented out
-	# and leave 'force-reload' as an alias for 'restart'.
-	#
-	#log_daemon_msg "Reloading $DESC" "$NAME"
-	#do_reload
-	#log_end_msg $?
-	#;;
-  restart|force-reload)
-	#
-	# If the "reload" option is implemented then remove the
-	# 'force-reload' alias
-	#
-	log_daemon_msg "Restarting $DESC" "$NAME"
-	do_stop
-	case "$?" in
-	  0|1)
-		do_start
-		case "$?" in
-			0) log_end_msg 0 ;;
-			1) log_end_msg 1 ;; # Old process is still running
-			*) log_end_msg 1 ;; # Failed to start
-		esac
-		;;
-	  *)
-	  	# Failed to stop
-		log_end_msg 1
-		;;
-	esac
-	;;
-  *)
-	#echo "Usage: $SCRIPTNAME {start|stop|restart|reload|force-reload}" >&2
-	echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2
-	exit 3
-	;;
-esac
-
-:
diff --git a/debian/openggsn.install b/debian/openggsn.install
index 4b301e1..246e361 100644
--- a/debian/openggsn.install
+++ b/debian/openggsn.install
@@ -1,3 +1,5 @@
 /usr/bin/ggsn
 /usr/bin/sgsnemu
 /usr/share/man/man8/*
+examples/ggsn.conf etc/
+examples/sgsnemu.conf etc/

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/openggsn.git



More information about the debian-science-commits mailing list