From: Sean Whitton <spwhitton@spwhitton.name>
Date: Wed, 4 Aug 2021 22:26:28 +0000 (-0700)
Subject: prefix users created in postinsts with an underscore
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=commitdiff_plain;h=6dbecc3652a8fde95abfb0b47da0238529b60988;p=userv-utils.git

prefix users created in postinsts with an underscore
---

diff --git a/debian/userv-dyndns.postinst b/debian/userv-dyndns.postinst
index eaf7803..6517a45 100755
--- 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 5ccaa88..f055c84 100755
--- 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 e0a769d..b7fc855 100644
--- 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