r23669 - in /scripts/KGB: debian/default debian/dirs debian/init debian/postinst server/kgb.conf.sample

[dmn at users.alioth.debian.org]

Author: dmn
Date: Mon Jul 28 15:22:38 2008
New Revision: 23669

URL: http://svn.debian.org/wsvn/?sc=1&rev=23669
Log:
run the daemon as Debian-kgb user; store PID file in a subdir of /var/run

Added:
    scripts/KGB/debian/dirs
    scripts/KGB/debian/postinst
Modified:
    scripts/KGB/debian/default
    scripts/KGB/debian/init
    scripts/KGB/server/kgb.conf.sample

Modified: scripts/KGB/debian/default
URL: http://svn.debian.org/wsvn/scripts/KGB/debian/default?rev=23669&op=diff
==============================================================================
--- scripts/KGB/debian/default (original)
+++ scripts/KGB/debian/default Mon Jul 28 15:22:38 2008
@@ -1,3 +1,5 @@
 # Configuration for kgb-bot init script
 # Set to 1 to enable KGB at startup
 BOT_ENABLED=0
+
+RUN_AS=Debian-kgb

Added: scripts/KGB/debian/dirs
URL: http://svn.debian.org/wsvn/scripts/KGB/debian/dirs?rev=23669&op=file
==============================================================================
--- scripts/KGB/debian/dirs (added)
+++ scripts/KGB/debian/dirs Mon Jul 28 15:22:38 2008
@@ -1,0 +1,1 @@
+var/run/kgb-bot

Modified: scripts/KGB/debian/init
URL: http://svn.debian.org/wsvn/scripts/KGB/debian/init?rev=23669&op=diff
==============================================================================
--- scripts/KGB/debian/init (original)
+++ scripts/KGB/debian/init Mon Jul 28 15:22:38 2008
@@ -20,12 +20,13 @@
 NAME=kgb-bot
 DAEMON=/usr/sbin/$NAME
 DAEMON_ARGS="--config /etc/kgb/kgb.conf"
-PIDFILE=/var/run/$NAME.pid
+PIDFILE=/var/run/kgb-bot/$NAME.pid
 SCRIPTNAME=/etc/init.d/$NAME
 
 # Exit if the package is not installed
 [ -x "$DAEMON" ] || exit 0
 
+RUN_AS='Debian-kgb'
 # Read configuration variable file if it is present
 [ -r /etc/default/$NAME ] && . /etc/default/$NAME
 
@@ -45,9 +46,9 @@
 	#   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 \
+	start-stop-daemon --start --quiet --chuid $RUN_AS --pidfile $PIDFILE --exec $DAEMON --test > /dev/null \
 		|| return 1
-	start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON -- \
+	start-stop-daemon --start --quiet --chuid $RUN_AS --pidfile $PIDFILE --exec $DAEMON -- \
 		$DAEMON_ARGS \
 		|| return 2
 	# Add code here, if necessary, that waits for the process to be ready

Added: scripts/KGB/debian/postinst
URL: http://svn.debian.org/wsvn/scripts/KGB/debian/postinst?rev=23669&op=file
==============================================================================
--- scripts/KGB/debian/postinst (added)
+++ scripts/KGB/debian/postinst Mon Jul 28 15:22:38 2008
@@ -1,0 +1,30 @@
+#!/bin/sh
+
+set -e
+set -u
+
+if [ "$1" = "configure" ]; then
+    set +e
+    getent passwd Debian-kgb > /dev/null
+    GETENT=$?
+    set -e
+
+    # not found?
+    if [ $GETENT -eq 2 ]; then
+        adduser --system --group --home /dev/null --no-create-home \
+            --disabled-login --gecos "KGB bot" --force-badname Debian-kgb
+    elif [ $GETENT -ne 0 ]; then
+        echo "getent returned error code $GETENT. aborting" >&2
+        exit 1
+    fi
+
+    if ! dpkg-statoverride --list /etc/kgb/kgb.conf > /dev/null; then
+        dpkg-statoverride --update --add root Debian-kgb 0640 /etc/kgb/kgb.conf
+    fi
+
+    if ! dpkg-statoverride --list /var/run/kgb-bot > /dev/null; then
+        dpkg-statoverride --update --add root Debian-kgb 0775 /var/run/kgb-bot
+    fi
+fi
+
+#DEBHELPER#

Modified: scripts/KGB/server/kgb.conf.sample
URL: http://svn.debian.org/wsvn/scripts/KGB/server/kgb.conf.sample?rev=23669&op=diff
==============================================================================
--- scripts/KGB/server/kgb.conf.sample (original)
+++ scripts/KGB/server/kgb.conf.sample Mon Jul 28 15:22:38 2008
@@ -23,7 +23,6 @@
     network: freenode
     repos:
       - foo
-# defaults to /var/run
-pid_dir: ~
+pid_dir: /var/run/kgb-bot
 # anything less is rejected
 min_protocol_ver: 1