5 files changed, 6 insertions(+), 6 deletions(-)

M sr.ht/git.sr.ht/git.sr.ht-webhooks.confd
M sr.ht/git.sr.ht/git.sr.ht-webhooks.initd
M sr.ht/git.sr.ht/git.sr.ht.confd
M sr.ht/git.sr.ht/git.sr.ht.initd
M sr.ht/git.sr.ht/git.sr.ht.post-install

@@ 1,5 1,5 @@
 # Run the daemon as this user:
-# GIT_USER=gitsrht
+# GIT_USER=git
 
 # Extra arguments to pass to celery
 # GIT_ARGS=

@@ 2,7 2,7 @@
 name="git.sr.ht-webhooks"
 description="git.sr.ht webhook delivery service"
 supervisor=supervise-daemon
-GIT_USER=${GIT_USER:-gitsrht}
+GIT_USER=${GIT_USER:-git}
 GIT_ARGS=${GIT_ARGS:-}
 LOCAL_PG=${LOCAL_PG:-yes}
 LOGS=/var/log/git.sr.ht-webhooks.log

@@ 1,5 1,5 @@
 # Run the daemon as this user:
-# GIT_USER=gitsrht
+# GIT_USER=git
 
 # Bind the web service to this address:
 # GIT_BIND=127.0.0.1:5001

@@ 2,7 2,7 @@
 name="git.sr.ht"
 description="git.sr.ht service"
 supervisor=supervise-daemon
-GIT_USER=${GIT_USER:-gitsrht}
+GIT_USER=${GIT_USER:-git}
 GIT_BIND=${GIT_BIND:-127.0.0.1:5001}
 GIT_ARGS=${GIT_ARGS:-}
 LOCAL_PG=${LOCAL_PG:-yes}

@@ 1,3 1,3 @@
 #!/bin/sh
-addgroup -S metasrht || true
-adduser -SDH -s /sbin/nologin -g metasrht metasrht || true
+addgroup -S git || true
+adduser -SDH -h /var/lib/git -s /bin/sh -G git -g git git || true