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

diff --git a/debian/changelog b/debian/changelog
index 063132f0bdd0e9e720c0e81200530274a08acc11..bcd63e715425ce266cb6219e663fb7f6033a4360 100644 (file)
--- 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 1d4f740baa2b767493587c1d54bb96d59fc49f58..5ed3b4e90bb73eb8e372ca835f8a3ecf808dae81 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=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 3c803bd25a952951c000afa043862b779bafa39e..e0a769d9f699bd360dafea78b499e5d09d6b6932 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 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 ea76975c2936bc839c45c3e324f8d2d4d34455db..22407c73d99d216a39d65f0f0caa2c164de89258 100644 (file)
--- 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 76d9946e38d47757ae62472819f1f400ef9a7d85..97edd702ca263f51690a3c635ea09f9e73ef6ac4 100644 (file)
--- 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