Improved user creation

5 files changed, 24 insertions, 36 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 85abb8d20745..f32f6a30efeb 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -23,9 +23,13 @@ pkgbase = gitea-git
 	source = git://github.com/go-gitea/gitea.git#branch=master
 	source = gitea.service.patch
 	source = app.ini
+	source = gitea.sysusers
+	source = gitea.tmpfiles
 	sha256sums = SKIP
 	sha256sums = f7b570315bd98a4e2d1c82ebdc2e78d76f6df49286ca4ac59cfb2b3f9985d1f9
 	sha256sums = 3697c023a58737474d0a3dd815988516acca08324147edfb7035c46ba237219b
+	sha256sums = d8efbf6f1e634548a3ee875c9a7444282966ffe76f2ed9532ee7b724a364264b
+	sha256sums = 5631db5f47b41cdae180b98214e436856daec497949c68c1e13f70f12bbb855d
 
 pkgname = gitea-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 09265eec54f5..57f630392100 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -11,10 +11,16 @@ pkgrel=1
 pkgdesc='A painless self-hosted Git service.'
 url='https://gitea.io/'
 license=('MIT')
-source=('git://github.com/go-gitea/gitea.git#branch=master' 'gitea.service.patch' 'app.ini')
+source=('git://github.com/go-gitea/gitea.git#branch=master'
+'gitea.service.patch'
+'app.ini'
+'gitea.sysusers'
+'gitea.tmpfiles')
 sha256sums=('SKIP'
             'f7b570315bd98a4e2d1c82ebdc2e78d76f6df49286ca4ac59cfb2b3f9985d1f9'
-            '3697c023a58737474d0a3dd815988516acca08324147edfb7035c46ba237219b')
+            '3697c023a58737474d0a3dd815988516acca08324147edfb7035c46ba237219b'
+            'd8efbf6f1e634548a3ee875c9a7444282966ffe76f2ed9532ee7b724a364264b'
+            '5631db5f47b41cdae180b98214e436856daec497949c68c1e13f70f12bbb855d')
 arch=('x86_64' 'i686')
 depends=('go' 'git')
 makedepends=('go' 'git' 'patch')
@@ -51,9 +57,12 @@ build() {
 
 package() {
   install -dm755 $pkgdir/var/lib/$_pkgname/{custom/conf,conf,data/{attachments,avatars,sessions,tmp},repo}
+  install -dm755 $pkgdir/var/log/gitea
   install -Dm755 "$srcdir/build/src/$_gourl/$_pkgname/$_pkgname" "$pkgdir/usr/bin/$_pkgname"
   install -Dm644 "$srcdir/build/src/$_gourl/$_pkgname/LICENSE" "$pkgdir/usr/share/licenses/$_pkgname/LICENSE"
   install -Dm644 "$srcdir/build/src/$_gourl/$_pkgname/scripts/systemd/gitea.service" "$pkgdir/usr/lib/systemd/system/gitea.service"
+  install -Dm644 "$srcdir/$_pkgname.sysusers" "$pkgdir/usr/lib/sysusers.d/gitea.conf"
+  install -Dm644 "$srcdir/$_pkgname.tmpfiles" "$pkgdir/usr/lib/tmpfiles.d/gitea.conf"
   install -Dm644 "$srcdir/app.ini" "$pkgdir/var/lib/$_pkgname/custom/conf/app.ini"
   cp -r $srcdir/build/src/$_gourl/$_pkgname/{conf,templates,public} $pkgdir/var/lib/$_pkgname
 }
diff --git a/gitea.install b/gitea.install
index f4b47fee58f6..48d5df3e6fd1 100644
--- a/gitea.install
+++ b/gitea.install
@@ -1,38 +1,10 @@
-pre_install() {
-  if ! getent group gitea >/dev/null; then
-    groupadd --system gitea
-  fi
-  if ! getent passwd gitea >/dev/null; then
-    useradd -m --system -c 'gitea daemon user' -g gitea -s /bin/false gitea
-  fi
-  chsh gitea -s /bin/bash
+post_install() {
+  systemd-sysusers gitea.conf
+  systemd-tmpfiles --create gitea.conf
 }
 
-post_install(){
-	mkdir -p /var/log/gitea
-	chown -R gitea:gitea /var/log/gitea
-	chown -R gitea:gitea /var/lib/gitea
-	systemctl daemon-reload
-}
-
-pre_upgrade(){
-	pre_install $1
-}
-
-post_upgrade() {
-	post_install $1
-}
-
-pre_remove() {
-	systemctl stop gitea.service
-	systemctl disable gitea.service
-}
+post_upgrade(){
+  systemd-tmpfiles --create gitea.conf
 
-post_remove() {
-  if getent passwd gitea >/dev/null; then
-    userdel gitea
-  fi
-  if getent group gitea >/dev/null; then
-    groupdel gitea
-  fi
+  echo ":: Consider restarting gitea.service"
 }
diff --git a/gitea.sysusers b/gitea.sysusers
new file mode 100644
index 000000000000..e4a8c191b278
--- /dev/null
+++ b/gitea.sysusers
@@ -0,0 +1 @@
+u gitea - "Gitea user" /var/lib/gitea
diff --git a/gitea.tmpfiles b/gitea.tmpfiles
new file mode 100644
index 000000000000..2aaa51b30613
--- /dev/null
+++ b/gitea.tmpfiles
@@ -0,0 +1,2 @@
+d /var/log/gitea 0755 gitea gitea -
+d /var/lib/gitea 0755 gitea gitea -