prefix users created in postinsts with an underscore

diff --git a/debian/userv-dyndns.postinst b/debian/userv-dyndns.postinst
index eaf78034d5e0a54d78637b6badf3ebe0dd7f6f39..6517a45673d9ece95a3385a455929c1058c66dbf 100755 (executable)
--- a/debian/userv-dyndns.postinst
+++ b/debian/userv-dyndns.postinst
@@ -25,6 +25,7 @@ set -e
 user="$(sed -n '/^[a-z]/{p;q;}' /etc/userv/dyndns-service-users)"
 
 if [ "$user" ]; then
-       adduser --system --quiet --group --gecos 'userv dyndns' \
+       adduser --system --force-badname --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 5ccaa8841cfc3ad192dacfc287b99c53df9ec1cc..f055c84bdc0e4e509c4668186863f3b71a929ca9 100755 (executable)
--- a/debian/userv-git-daemon.postinst
+++ b/debian/userv-git-daemon.postinst
@@ -22,7 +22,7 @@ set -e
 # You should have received a copy of the GNU General Public License
 # along with userv-utils; if not, see http://www.gnu.org/licenses/.
 
-GITDUSER=userv-git
+GITDUSER=_userv-git
 
 defaults=/etc/default/userv-git-daemon
 if test -f $defaults; then . $defaults; fi
@@ -30,6 +30,7 @@ if test -f $defaults; then . $defaults; fi
 #DEBHELPER#
 
 if [ "$GITDUSER" ]; then
-       adduser --system --quiet --group --gecos 'userv git daemon' \
+       adduser --system --force-badname --quiet --group \
+               --gecos 'userv git daemon' \
                --home /etc/userv --no-create-home --shell /bin/false $GITDUSER
 fi

diff --git a/dyndns/Makefile b/dyndns/Makefile
index e0a769d9f699bd360dafea78b499e5d09d6b6932..b7fc85579b2c5f87fc4f3d071d94018c5eb18994 100644 (file)
--- a/dyndns/Makefile
+++ b/dyndns/Makefile
@@ -27,7 +27,7 @@ install-examples:
                mkdir -p $(services)
                cp dyndns $(services)/dyndns.distrib
                cp dyndns-domains $(etcuserv)/dyndns-domains.example
-               echo userv-dyndns >$(etcuserv)/dyndns-service-users.example
+               echo _userv-dyndns >$(etcuserv)/dyndns-service-users.example
 
 install-docs:
                mkdir -p $(docdir)/userv-dyndns