fix ssh support

6 files changed, 12 insertions, 21 deletions

diff --git a/.SRCINFO b/.SRCINFO
index beb29e0cb7c7..edf9d0d588de 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = gitea-git
 	pkgdesc = A painless self-hosted Git service.
-	pkgver = r4805.8bc43195
+	pkgver = r4990.80f900eb
 	pkgrel = 1
 	url = https://gitea.io/
 	install = gitea.install
@@ -27,13 +27,9 @@ pkgbase = gitea-git
 	source = git://github.com/go-gitea/gitea.git
 	source = gitea.service.patch
 	source = app.ini
-	source = gitea.sysusers
-	source = gitea.tmpfiles
 	sha256sums = SKIP
 	sha256sums = f7b570315bd98a4e2d1c82ebdc2e78d76f6df49286ca4ac59cfb2b3f9985d1f9
-	sha256sums = 775e1f936d861ae7b421e4458bc5facfd64d0e219bf6c0c72fe58e76aa18a016
-	sha256sums = d8efbf6f1e634548a3ee875c9a7444282966ffe76f2ed9532ee7b724a364264b
-	sha256sums = 5631db5f47b41cdae180b98214e436856daec497949c68c1e13f70f12bbb855d
+	sha256sums = 6ec975577a54e68d05a9292230c1aee19358459366688819cec4445e8d3c5210
 
 pkgname = gitea-git
 
diff --git a/PKGBUILD b/PKGBUILD
index caa330f344bd..64bdd7356316 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,21 +7,17 @@
 _pkgname=gitea
 _gourl="code.gitea.io"
 pkgname=gitea-git
-pkgver=r4805.8bc43195
+pkgver=r4990.80f900eb
 pkgrel=1
 pkgdesc='A painless self-hosted Git service.'
 url='https://gitea.io/'
 license=('MIT')
 source=('git://github.com/go-gitea/gitea.git'
         'gitea.service.patch'
-        'app.ini'
-        'gitea.sysusers'
-        'gitea.tmpfiles')
+        'app.ini')
 sha256sums=('SKIP'
             'f7b570315bd98a4e2d1c82ebdc2e78d76f6df49286ca4ac59cfb2b3f9985d1f9'
-            '775e1f936d861ae7b421e4458bc5facfd64d0e219bf6c0c72fe58e76aa18a016'
-            'd8efbf6f1e634548a3ee875c9a7444282966ffe76f2ed9532ee7b724a364264b'
-            '5631db5f47b41cdae180b98214e436856daec497949c68c1e13f70f12bbb855d')
+            '6ec975577a54e68d05a9292230c1aee19358459366688819cec4445e8d3c5210')
 arch=('x86_64' 'i686' 'armv6h' 'armv7h')
 depends=('go')
 makedepends=('patch' 'git' 'go-bindata')
@@ -62,8 +58,6 @@ package() {
   install -Dm755 "${srcdir}/src/${_gourl}/${_pkgname}/${_pkgname}" "${pkgdir}/usr/bin/${_pkgname}"
   install -Dm644 "${srcdir}/src/${_gourl}/${_pkgname}/LICENSE" "${pkgdir}/usr/share/licenses/${_pkgname}/LICENSE"
   install -Dm644 "${srcdir}/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}/src/${_gourl}/${_pkgname}/{conf,templates,options,public} ${pkgdir}/var/lib/${_pkgname}
   cp -r ${srcdir}/src/${_gourl}/${_pkgname}/options/locale ${pkgdir}/var/lib/${_pkgname}/conf
diff --git a/app.ini b/app.ini
index 85a4b925d70c..0bc5783357bd 100644
--- a/app.ini
+++ b/app.ini
@@ -109,7 +109,7 @@ SSH_PORT = 22
 ; Port number builtin SSH server listens on
 SSH_LISTEN_PORT = %(SSH_PORT)s
 ; Root path of SSH directory, default is '~/.ssh', but you have to use '/home/git/.ssh'.
-SSH_ROOT_PATH =
+SSH_ROOT_PATH = /home/gitea/.ssh
 ; Directory to create temporary files when test publick key using ssh-keygen,
 ; default is system temporary directory.
 SSH_KEY_TEST_PATH =
diff --git a/gitea.install b/gitea.install
index 5c2138f1f6f1..a0dc0f8c03c4 100644
--- a/gitea.install
+++ b/gitea.install
@@ -1,6 +1,10 @@
 post_install() {
-  systemd-sysusers gitea.conf
-  systemd-tmpfiles --create gitea.conf
+  if ! getent group gitea >/dev/null; then
+    groupadd --system gitea
+  fi
+  if ! getent passwd gitea >/dev/null; then
+    useradd --system -c 'Gitea' -g gitea -m -d /home/gitea -s /bin/bash gitea
+  fi
   chown -R gitea:gitea /var/log/gitea
   chown -R gitea:gitea /var/lib/gitea
   systemctl daemon-reload
diff --git a/gitea.sysusers b/gitea.sysusers
deleted file mode 100644
index e4a8c191b278..000000000000
--- a/gitea.sysusers
+++ /dev/null
@@ -1 +0,0 @@
-u gitea - "Gitea user" /var/lib/gitea
diff --git a/gitea.tmpfiles b/gitea.tmpfiles
deleted file mode 100644
index 2aaa51b30613..000000000000
--- a/gitea.tmpfiles
+++ /dev/null
@@ -1,2 +0,0 @@
-d /var/log/gitea 0755 gitea gitea -
-d /var/lib/gitea 0755 gitea gitea -