[Oval-commits] r292 - in trunk/oval-server: . debian

[Pavel Vinogradov]

Author: blaze-guest
Date: 2007-10-30 17:41:39 +0000 (Tue, 30 Oct 2007)
New Revision: 292

Modified:
   trunk/oval-server/OvalServer.BUGS
   trunk/oval-server/debian/dirs
   trunk/oval-server/debian/oval-server.init
   trunk/oval-server/debian/postrm
Log:
Update debian package script - use oval-server user

Modified: trunk/oval-server/OvalServer.BUGS
===================================================================
--- trunk/oval-server/OvalServer.BUGS	2007-10-30 17:38:58 UTC (rev 291)
+++ trunk/oval-server/OvalServer.BUGS	2007-10-30 17:41:39 UTC (rev 292)
@@ -1,7 +1,6 @@
 - CTRL+C don't kill server
   Server will stop only after client request. Because HttpThread
   locked in handle_response() and can't be terminated until release lock.
-- Uses the same user as the agent, should be different
 - Set the umask or log permissions properly. This is not correct:
   -rwxrwxr-x 1 root oval 1241 2007-09-05 00:42 oval-server.log
 

Modified: trunk/oval-server/debian/dirs
===================================================================
--- trunk/oval-server/debian/dirs	2007-10-30 17:38:58 UTC (rev 291)
+++ trunk/oval-server/debian/dirs	2007-10-30 17:41:39 UTC (rev 292)
@@ -1,8 +1,7 @@
 usr/bin
-var/lib/oval-server
 etc/init.d
 etc/oval
+var/lib/oval-server
 var/log/oval
 var/cache/oval-server/definitions
 var/cache/oval-server/repos
-var/lib/oval/server/dsa

Modified: trunk/oval-server/debian/oval-server.init
===================================================================
--- trunk/oval-server/debian/oval-server.init	2007-10-30 17:38:58 UTC (rev 291)
+++ trunk/oval-server/debian/oval-server.init	2007-10-30 17:41:39 UTC (rev 292)
@@ -22,7 +22,7 @@
 PIDFILE=/var/run/oval-server.pid
 
 OVALSERVER_ENABLE=false
-OVALSERVER_USER=oval
+OVALSERVER_USER=oval-server
 OVALSERVER_CONFIG_FILE=/etc/oval/server.conf
 OVALSERVER_LOG_DIR=/var/log/oval/
 

Modified: trunk/oval-server/debian/postrm
===================================================================
--- trunk/oval-server/debian/postrm	2007-10-30 17:38:58 UTC (rev 291)
+++ trunk/oval-server/debian/postrm	2007-10-30 17:41:39 UTC (rev 292)
@@ -19,9 +19,6 @@
 # the debian-policy package
 
 
-# (jfs) BUG: Dpkg should not be invoked from within a postrm script
-OVALAGENT=`dpkg -l | grep oval-agent | awk '{print $1}'`
-
 case "$1" in
     purge)
    	rm -rf /var/cache/oval-server
@@ -29,23 +26,10 @@
     ;;
 
     remove)
-        # (jfs) BUG: No need to remove the directory, dpkg will
-        # remove it if empty, just remove the log file...
-	if [ "$OVALAGENT" != "ii" ]; then
-		rm -rf /var/log/oval
-	else
-		rm -rf /var/log/oval/oval-server.log
+	rm -rf /var/log/oval/oval-server.log
+	if id oval >/dev/null; then
+		deluser oval
 	fi
-	
-        # (jfs) BUG: This check should be more strict, this user
-        # might have been created by the user but not by the package
-        # also, it makes more sense to have an oval-agent and oval-server
-        # users so that they do not overlap
-	if [ "$OVALAGENT" != "ii" ]; then
-		if id oval >/dev/null; then
-			deluser oval
-		fi
-	fi
     ;;
 
     upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)