Make removal code similar to creation code (source default file and define sane defau...

git-svn-id: svn://anonscm.debian.org/ddp/manuals/trunk/developers-reference@3585 313b444b-1b9f-4f58-a734-7bb04f332e8d

diff --git a/developers-reference.sgml b/developers-reference.sgml
index ffd88a593d2847320cbcf7f2a7540db718c4affb..1229372aa4a3470d7e430ec042ba47f1a7c6c223 100644 (file)
--- a/developers-reference.sgml
+++ b/developers-reference.sgml
@@ -7,7 +7,7 @@
   <!ENTITY % dynamicdata  SYSTEM "dynamic.ent" > %dynamicdata;
 
   <!-- CVS revision of this document -->
-  <!ENTITY cvs-rev "$Revision: 1.280 $">
+  <!ENTITY cvs-rev "$Revision: 1.281 $">
 
   <!-- if you are translating this document, please notate the CVS
        revision of the original developer's reference in cvs-en-rev -->
@@ -4394,6 +4394,14 @@ uids and the gid is belongs to a system group:
 case "$1" in
     purge)
 [...]
+         # Definitions for this package
+         [ -f "/etc/default/<var>packagename</var>" ] && . /etc/default/<var>packagename</var>
+
+         # Sane defaults:
+
+         [ -z "$SERVER_USER" ] && SERVER_USER=<var>server_user</var>
+         [ -z "$SERVER_GROUP" ] && SERVER_GROUP=<var>server_group</var>
+
          # find first and last SYSTEM_UID numbers
         if [ -r /etc/adduser.conf ] ; then
           for LINE in `grep SYSTEM_UID /etc/adduser.conf | grep -v "^#"`; do
@@ -4422,28 +4430,26 @@ case "$1" in
         [ -z "$LAST_SYSTEM_GID" ] && LAST_SYSTEM_GID=999
 
          # Remove system account if it is a system user
-         CREATEDUSER="<var>server_user</var>"
          if [ -n "$FIRST_SYSTEM_UID" ] && [ -n "$LAST_SYSTEM_UID" ]; then
-            if USERID=`getent passwd $CREATEDUSER | cut -f 3 -d ':'`; then
+            if USERID=`getent passwd $SERVER_USER | cut -f 3 -d ':'`; then
                if [ -n "$USERID" ]; then
                   if [ "$FIRST_SYSTEM_UID" -le "$USERID" ] && \
                      [ "$USERID" -le "$LAST_SYSTEM_UID" ]; then
-                       echo -n "Removing $CREATEDUSER system user.."
-                        deluser --quiet $CREATEDUSER || true
+                       echo -n "Removing $SERVER_USER system user.."
+                        deluser --quiet $SERVER_USER || true
                        echo "..done"
                   fi
                fi
             fi
          fi
          # Remove system group if it is a system group
-         CREATEDGROUP=<var>server_group</var>
          if [ -n "$FIRST_SYSTEM_GID" ] && [ -n "$LAST_SYSTEM_GID" ]; then
-            if GROUPGID=`getent group $CREATEDGROUP | cut -f 3 -d ':'`; then
+            if GROUPGID=`getent group $SERVER_GROUP | cut -f 3 -d ':'`; then
                if [ -n "$GROUPGID" ]; then
                   if [ "$FIRST_SYSTEM_GID" -le "$GROUPID" ] && \
                      [ "$GROUPID" -le "$LAST_SYSTEM_GID" ]; then
-                       echo -n "Removing $CREATEDGROUP group.."
-                       delgroup --only-if-empty $CREATEDGROUP || true
+                       echo -n "Removing $SERVER_GROUP group.."
+                       delgroup --only-if-empty $SERVER_GROUP || true
                        echo "..done"
                   fi
                fi