[SCM] Debian packaging of Pinto CPAN distribution branch, master, updated. 9e622baaeac0150a263ad85307cfef085d4c717d

[Oleg Gashev]

The following commit has been merged in the master branch:
commit 0e02c2492f7e31320b9413b69789cb07d38016d1
Author: Oleg Gashev <oleg at gashev.net>
Date:   Sat Jun 8 10:48:54 2013 +0000

    Removed pinto user.
    Currently daemonizing the pintod server will run the starman workers as root.
    http://search.cpan.org/~thaljef/Pinto-0.084/lib/Pinto/Manual/Installing.pod

diff --git a/debian/pinto.init b/debian/pinto.init
index 723840b..f4fa0f1 100644
--- a/debian/pinto.init
+++ b/debian/pinto.init
@@ -12,7 +12,7 @@
 PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
 DAEMON=/usr/bin/pintod
 NAME=pintod
-PIDFILE=/var/run/pinto/$NAME.pid
+PIDFILE=/var/run/$NAME.pid
 DEFAULTS_FILE=/etc/default/pinto
 DESC="pinto perl module repository"
 
@@ -44,7 +44,7 @@ start_if_configured() {
 
 	if ! check_started; then
 		log_daemon_msg "Starting $DESC" "$NAME"
-		if ! START_ERROR=`start-stop-daemon --chuid pinto -u pinto --start --pidfile $PIDFILE --exec $DAEMON -- $PINTOD_OPTS --pid $PIDFILE 2>&1`; then
+		if ! START_ERROR=`start-stop-daemon --start --pidfile $PIDFILE --exec $DAEMON -- $PINTOD_OPTS --pid $PIDFILE 2>&1`; then
 			echo -n " "
 			log_action_end_msg 1 "$START_ERROR"
 			exit 0
diff --git a/debian/pinto.logrotate b/debian/pinto.logrotate
index ed1e740..85b7bf2 100644
--- a/debian/pinto.logrotate
+++ b/debian/pinto.logrotate
@@ -5,7 +5,7 @@
     compress
     delaycompress
     notifempty
-    create 640 pinto adm
+    create 640 root adm
     sharedscripts
     endscript
 }
diff --git a/debian/pinto.postinst b/debian/pinto.postinst
index 9acdd4a..5c52097 100644
--- a/debian/pinto.postinst
+++ b/debian/pinto.postinst
@@ -5,10 +5,6 @@ set -e
 . /usr/share/debconf/confmodule
 
 if [ "$1" = configure ]; then
-	getent group pinto >/dev/null 2>&1 || addgroup --system pinto
-	getent passwd pinto >/dev/null 2>&1 ||
-	adduser --system --no-create-home --disabled-password --ingroup pinto pinto
-
 	if [ ! -e /var/lib/pinto ] ; then
 		/usr/bin/pinto -r /var/lib/pinto init
 	else
@@ -18,27 +14,18 @@ if [ "$1" = configure ]; then
 		echo "and exec /usr/bin/pinto -r /var/lib/pinto init."
 	fi
 
-	if [ ! -e /var/run/pinto ] ; then
-		mkdir -p /var/run/pinto
-		chown root:pinto /var/run/pinto
-		chmod 0775 /var/run/pinto
-	fi
-
 	if [ ! -e /var/log/pinto ] ; then
 		mkdir -p /var/log/pinto
-		chown pinto:adm /var/log/pinto
 		chmod 0750 /var/log/pinto
 	fi
 
 	if [ ! -e /var/log/pinto/access.log ] ; then
 		touch /var/log/pinto/access.log
-		chown pinto:adm /var/log/pinto/access.log
 		chmod 0640 /var/log/pinto/access.log
 	fi
 
 	if [ ! -e /var/log/pinto/error.log ] ; then
 		touch /var/log/pinto/error.log
-		chown pinto:adm /var/log/pinto/error.log
 		chmod 0640 /var/log/pinto/error.log
 	fi
 
diff --git a/debian/pinto.postrm b/debian/pinto.postrm
index ddc68b7..4cb3e67 100644
--- a/debian/pinto.postrm
+++ b/debian/pinto.postrm
@@ -3,32 +3,17 @@
 set -e
 
 case "$1" in
-       
-    purge)
-
-	for d in /var/run/pinto \
-		/var/log/pinto \
-		/var/lib/pinto ; do
-		rm -rf $d 2> /dev/null || true;
-	done;
-
-        # Delete pinto daemon user, if it exists
-        if getent passwd pinto > /dev/null ; then
-            echo "Deleting pinto user."
-            deluser  --quiet pinto > /dev/null || true
-        fi
-
-    ;;
-
-    remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
-
-        ;;
-
-    *)
-
-        echo "postrm called with unknown argument \`$1'" >&2
-        exit 1
-
+	purge)
+		for d in /var/log/pinto \
+			/var/lib/pinto ; do
+			rm -rf $d 2> /dev/null || true;
+		done;
+		;;
+	remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+		;;
+	*)
+		echo "postrm called with unknown argument \`$1'" >&2
+		exit 1
 esac
 
 #DEBHELPER#

-- 
Debian packaging of Pinto CPAN distribution