r2019 - vdr/vdradmin/trunk/debian

[Thomas Schmidt]

Author: tschmidt
Date: 2006-03-13 21:33:24 +0000 (Mon, 13 Mar 2006)
New Revision: 2019

Modified:
   vdr/vdradmin/trunk/debian/changelog
   vdr/vdradmin/trunk/debian/postinst
   vdr/vdradmin/trunk/debian/postrm
   vdr/vdradmin/trunk/debian/vdradmin-am.init
Log:
vdradmin: run as user vdradmin-am

Modified: vdr/vdradmin/trunk/debian/changelog
===================================================================
--- vdr/vdradmin/trunk/debian/changelog	2006-03-13 21:02:54 UTC (rev 2018)
+++ vdr/vdradmin/trunk/debian/changelog	2006-03-13 21:33:24 UTC (rev 2019)
@@ -10,6 +10,7 @@
       template dir to a safe location too (closes: #356402)
     - Moving configuration files from /var/lib/vdradmin/ to
       /var/lib/vdradmin-am when upgrading the package
+    - Run as user vdradmin-am instead of just vdradmin
     - Delete /var/lib/vdradmin-am/vdradmind.done too, when purging the package
 
  -- Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>  Sun, 12 Mar 2006 20:00:06 +0100

Modified: vdr/vdradmin/trunk/debian/postinst
===================================================================
--- vdr/vdradmin/trunk/debian/postinst	2006-03-13 21:02:54 UTC (rev 2018)
+++ vdr/vdradmin/trunk/debian/postinst	2006-03-13 21:33:24 UTC (rev 2019)
@@ -34,8 +34,8 @@
 fi
 
 # ensure that user and group 'vdradmin' exist
-USER=vdradmin
-GROUP=vdradmin
+USER=vdradmin-am
+GROUP=vdradmin-am
 if ! getent group | grep -q "^$GROUP:" ; then
 	echo -n "Adding group $GROUP.."
        	addgroup --quiet --system $GROUP
@@ -44,7 +44,7 @@
 if ! getent passwd | grep -q "^$USER:"; then
 	echo -n "Adding user $USER.."
        	adduser --system --home /var/lib/vdradmin-am --shell /bin/false \
-		--gecos "VDRAdmin user" --no-create-home \
+		--gecos "VDRAdmin-am user" --no-create-home \
                	--disabled-login --disabled-password \
                	--ingroup $GROUP \
                	$USER

Modified: vdr/vdradmin/trunk/debian/postrm
===================================================================
--- vdr/vdradmin/trunk/debian/postrm	2006-03-13 21:02:54 UTC (rev 2018)
+++ vdr/vdradmin/trunk/debian/postrm	2006-03-13 21:33:24 UTC (rev 2019)
@@ -14,7 +14,7 @@
 
     	chown root:root /var/log/vdradmind.log > /dev/null 2>&1 || true
 	
-	deluser vdradmin > /dev/null || true
+	deluser vdradmin-am > /dev/null || true
     ;;
     remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
     ;;

Modified: vdr/vdradmin/trunk/debian/vdradmin-am.init
===================================================================
--- vdr/vdradmin/trunk/debian/vdradmin-am.init	2006-03-13 21:02:54 UTC (rev 2018)
+++ vdr/vdradmin/trunk/debian/vdradmin-am.init	2006-03-13 21:33:24 UTC (rev 2019)
@@ -8,8 +8,8 @@
 # Default Settings:
 
 # Username/Group vdradmin should run as:
-USER=vdradmin
-GROUP=vdradmin
+USER=vdradmin-am
+GROUP=vdradmin-am
 
 PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
 DAEMON=/usr/bin/vdradmind.pl