From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Mon, 9 Dec 2013 16:42:32 +0000 (+0000)
Subject: Change default user for git-daemon to userv-git and default user for dyndns to userv... 
X-Git-Tag: userv/0.6.1~49
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=userv-utils.git;a=commitdiff_plain;h=f07baecf09e3be6b1ef01a02fd31f95db702ad86

Change default user for git-daemon to userv-git and default user for dyndns to userv-dyndns.
---

diff --git a/debian/changelog b/debian/changelog
index 063132f..bcd63e7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ userv-utils (0.6.0~~iwj3) unstable; urgency=low
   * No longer mention SLIP and udptunnel in the userv-ipif Description.
   * Americanise spelling of /usr/share/common-licences to ...-licenses.
   * Add debhelper token to postinst scripts.
+  * Change default user for git-daemon to userv-git and
+    default user for dyndns to userv-dyndns.
 
  --
 
diff --git a/debian/userv-git-daemon.postinst b/debian/userv-git-daemon.postinst
index 1d4f740..5ed3b4e 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=git
+GITDUSER=userv-git
 
 defaults=/etc/default/userv-git-daemon
 if test -f $defaults; then . $defaults; fi
diff --git a/dyndns/Makefile b/dyndns/Makefile
index 3c803bd..e0a769d 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 usdyndns >$(etcuserv)/dyndns-service-users.example
+		echo userv-dyndns >$(etcuserv)/dyndns-service-users.example
 
 install-docs:
 		mkdir -p $(docdir)/userv-dyndns
diff --git a/git-daemon/Makefile b/git-daemon/Makefile
index ea76975..22407c7 100644
--- a/git-daemon/Makefile
+++ b/git-daemon/Makefile
@@ -7,7 +7,7 @@
 
 include ../settings.make
 
-gituser=	git
+gituser=	userv-git
 varloggit=	$(varlog)/git
 
 TARGETS=	git-upload-pack inetd.conf git-daemon git-service logrotate
diff --git a/git-daemon/README b/git-daemon/README
index 76d9946..97edd70 100644
--- a/git-daemon/README
+++ b/git-daemon/README
@@ -15,7 +15,7 @@ userv-git-daemon uses $(libuserv), $(etcuserv), and $(services).
 
 Type make install.
 
-Create a "git" user that will run the outer part of the git-daemon.
+Create a "userv-git" user that will run the outer part of the git-daemon.
 Ensure your /etc/services contains a line like "git 9418/tcp".
 
 Insert the inetd.conf fragment into your /etc/inetd.conf