From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Mon, 9 Dec 2013 16:43:53 +0000 (+0000)
Subject: Improve adduser calls:
X-Git-Tag: userv/0.6.1~48
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=userv-utils.git;a=commitdiff_plain;h=0c1c66930bc8d68b849d5bf91da29d30d51dc289

Improve adduser calls:
   - no longer guard with calls to id, as adduser --quiet is idempotent
   - pass --shell /bin/false and --no-create-home
---

diff --git a/debian/changelog b/debian/changelog
index bcd63e7..93ae89f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,9 @@ userv-utils (0.6.0~~iwj3) unstable; urgency=low
   * Add debhelper token to postinst scripts.
   * Change default user for git-daemon to userv-git and
     default user for dyndns to userv-dyndns.
+  * Improve adduser calls:
+     - no longer guard with calls to id, as adduser --quiet is idempotent
+     - pass --shell /bin/false and --no-create-home
 
  --
 
diff --git a/debian/userv-dyndns.postinst b/debian/userv-dyndns.postinst
index da9acd7..a6779f9 100755
--- a/debian/userv-dyndns.postinst
+++ b/debian/userv-dyndns.postinst
@@ -23,7 +23,8 @@ set -e
 #DEBHELPER#
 
 user="$(sed -n '/^[a-z]/{p;q;}' /etc/userv/dyndns-service-users)"
-if id $user >/dev/null 2>&1; then exit 0; fi
 
-adduser --system --group --gecos 'userv dyndns' \
-	--home /etc/userv
+if [ "$user" ]; then
+	adduser --system --quiet --group --gecos 'userv dyndns' \
+	   	--home /etc/userv --no-create-home --shell /bin/false $user
+fi
diff --git a/debian/userv-git-daemon.postinst b/debian/userv-git-daemon.postinst
index 5ed3b4e..5ccaa88 100755
--- a/debian/userv-git-daemon.postinst
+++ b/debian/userv-git-daemon.postinst
@@ -30,8 +30,6 @@ if test -f $defaults; then . $defaults; fi
 #DEBHELPER#
 
 if [ "$GITDUSER" ]; then
-	if id $GITDUSER >/dev/null 2>&1; then exit 0; fi
-
-	adduser --system --group --gecos 'userv git daemon' \
-		--home /etc/userv $GITDUSER
+	adduser --system --quiet --group --gecos 'userv git daemon' \
+		--home /etc/userv --no-create-home --shell /bin/false $GITDUSER
 fi