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 bcd63e715425ce266cb6219e663fb7f6033a4360..93ae89fb5da071dedfb8997605ef3501d13870b1 100644 (file)
--- 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 da9acd7b1a36a04abf5d902a32bef8bd42746291..a6779f9c4d1b1900430d122c5fb9a4d169f7845c 100755 (executable)
--- 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 5ed3b4e90bb73eb8e372ca835f8a3ecf808dae81..5ccaa8841cfc3ad192dacfc287b99c53df9ec1cc 100755 (executable)
--- 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