Use gitea user

Also fix a minor issue where dependencies that had changed weren't being picked up because an existing go.mod file created by a previous build of the package was cached.
author: Sam Whited 2018-12-13 09:49:32 -0600
committer: Sam Whited 2018-12-13 10:01:02 -0600
commit: 93b8421c2f8a44e89a56a3d36afb5c3a58ea0b39 (patch)
tree: 09f72ac45235141282acb957e83b829d3534f2e6
parent: 4b1df37b692a138c111c11505bd542d125d9bfca (diff)
download: aur-93b8421c2f8a44e89a56a3d36afb5c3a58ea0b39.tar.gz
8 files changed, 114 insertions, 35 deletions
diff --git a/.SRCINFO b/.SRCINFO
index d91503110126..2d1eac610cf3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,9 @@
 pkgbase = gitea-git
 	pkgdesc = Painless self-hosted Git service. Community managed fork of Gogs.
-	pkgver = v1.6.0_rc1_103_gd487a76ee284
+	pkgver = v1.6.0_rc1_180_gb3b7598ec684
 	pkgrel = 1
 	url = https://gitea.io/
+	install = gitea.install
 	arch = x86_64
 	arch = i686
 	arch = arm
@@ -26,13 +27,15 @@ pkgbase = gitea-git
 	source = git+https://github.com/go-gitea/gitea.git
 	source = gitea.tmpfiles
 	source = gitea.service
-	source = gitea-repos.patch
+	source = gitea.sysusers
+	source = gitea-arch-defaults.patch
 	source = gitea-ldflags.patch
 	source = gitea-disable-u2f.patch
 	sha512sums = SKIP
-	sha512sums = 0c58381f38fff0d029fd1b32f65536a7f96d0daa4aa1ee7c1c483f818c822c0088bfa980991800775eaece272e9d995faf5cadb7cfe648c75b6da579f38f3ed6
-	sha512sums = 6487cd8a5de45e68bc842979197c442d1cbd8c79cf6781431e8965a2ef89cccadc20f75f3ee2e3403707ddb9f801ec782dec360fabc9d9dfc2ce2b1edd76482a
-	sha512sums = 7bed1338af9d44de55964b9cf98816109da45a43c07b3260f51b7d517cf2e2d0c496c8ba5df44d57c9a8aa6aea18614a619ea14600a8f62d72c79485a74e6ab0
+	sha512sums = 89bf119a91fd48ed35c06131c67de1b4300bd2e79522c47aee9a73d7f1ebb08d9bceadc37408bd2425475d92c8bf59d87a799f2ce0a46bee860bf9fc7a904103
+	sha512sums = 0b93ddbb88ff843014f583a36c00156c011cca568cb69b61eb4c576c557b21ecdab1b105815a5dfdd08349e4e3b0976c8bdf87c8d3b201edae95de9070200352
+	sha512sums = 77f672ed82bc8f78ca04b1e2b7c7d026cb897da6e4f057817adbe1242bf8a67875061553806e6b027cdb3266cdf217ee3993efd9242a66c5802ed34344b5ded1
+	sha512sums = 36abba7ed22a1ce59ab1005b988f177d8ab13101684237d515a80b12a082487f8643f6f36d15e0b0823949134cecc61bd523057e80a93cf4c98d2e5b5902d968
 	sha512sums = 8d3024a17c8faae80b2af349457701c45695f70e2e5c5bf43f33c277bde8241f5e01ee08c534902fd5be976b49d85d0112bda7a2e6fb940179a99029d9e404fb
 	sha512sums = 779869c10bcb37581cde6df38f0905618099d604f29b0281abc4fa4c2302b8063063d0e8b0efdd99897b127c45103d376ba4a121e66edd51944abaf0235ab834
 
diff --git a/PKGBUILD b/PKGBUILD
index 8996f3598c99..9ad6b9dc540f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,7 +8,7 @@
 
 _pkgname='gitea'
 pkgname=gitea-git
-pkgver=v1.6.0_rc1_103_gd487a76ee284
+pkgver=v1.6.0_rc1_180_gb3b7598ec684
 pkgrel=1
 pkgdesc='Painless self-hosted Git service. Community managed fork of Gogs.'
 arch=('x86_64' 'i686' 'arm' 'armv6h' 'armv7h' 'aarch64')
@@ -29,15 +29,18 @@ provides=('gitea')
 source=("git+https://github.com/go-gitea/gitea.git"
         gitea.tmpfiles
         gitea.service
-        gitea-repos.patch
+        gitea.sysusers
+        gitea-arch-defaults.patch
         gitea-ldflags.patch
         gitea-disable-u2f.patch)
 sha512sums=('SKIP'
-            '0c58381f38fff0d029fd1b32f65536a7f96d0daa4aa1ee7c1c483f818c822c0088bfa980991800775eaece272e9d995faf5cadb7cfe648c75b6da579f38f3ed6'
-            '6487cd8a5de45e68bc842979197c442d1cbd8c79cf6781431e8965a2ef89cccadc20f75f3ee2e3403707ddb9f801ec782dec360fabc9d9dfc2ce2b1edd76482a'
-            '7bed1338af9d44de55964b9cf98816109da45a43c07b3260f51b7d517cf2e2d0c496c8ba5df44d57c9a8aa6aea18614a619ea14600a8f62d72c79485a74e6ab0'
+            '89bf119a91fd48ed35c06131c67de1b4300bd2e79522c47aee9a73d7f1ebb08d9bceadc37408bd2425475d92c8bf59d87a799f2ce0a46bee860bf9fc7a904103'
+            '0b93ddbb88ff843014f583a36c00156c011cca568cb69b61eb4c576c557b21ecdab1b105815a5dfdd08349e4e3b0976c8bdf87c8d3b201edae95de9070200352'
+            '77f672ed82bc8f78ca04b1e2b7c7d026cb897da6e4f057817adbe1242bf8a67875061553806e6b027cdb3266cdf217ee3993efd9242a66c5802ed34344b5ded1'
+            '36abba7ed22a1ce59ab1005b988f177d8ab13101684237d515a80b12a082487f8643f6f36d15e0b0823949134cecc61bd523057e80a93cf4c98d2e5b5902d968'
             '8d3024a17c8faae80b2af349457701c45695f70e2e5c5bf43f33c277bde8241f5e01ee08c534902fd5be976b49d85d0112bda7a2e6fb940179a99029d9e404fb'
             '779869c10bcb37581cde6df38f0905618099d604f29b0281abc4fa4c2302b8063063d0e8b0efdd99897b127c45103d376ba4a121e66edd51944abaf0235ab834')
+install=gitea.install
 
 pkgver() {
   cd "${srcdir}/${_pkgname}"
@@ -47,12 +50,14 @@ pkgver() {
 prepare() {
   cd ${srcdir}/${_pkgname}
   # Change default repos path for ArchLinux
-  patch -Np1 -i ../../gitea-repos.patch
+  patch -Np1 -i ../../gitea-arch-defaults.patch
   # Fix LDFLAGS not being respected by Go
   patch -Np1 -i ../../gitea-ldflags.patch
   # https://github.com/go-gitea/gitea/issues/4692
   patch -Np1 -i ../../gitea-disable-u2f.patch
 
+  # Make sure we rebuild the mod file from Gopkg.toml to pick up any changes.
+  rm -f go.mod
   go mod init || true
 }
 
@@ -68,6 +73,7 @@ package() {
   install -Dm644 ${_pkgname}/LICENSE -t "${pkgdir}"/usr/share/licenses/${_pkgname}/
   install -Dm644 ${_pkgname}.service -t "${pkgdir}"/usr/lib/systemd/system/
   install -Dm644 ${_pkgname}.tmpfiles "${pkgdir}"/usr/lib/tmpfiles.d/${_pkgname}.conf
+  install -Dm644 ${_pkgname}.sysusers "${pkgdir}"/usr/lib/sysusers.d/${_pkgname}.conf
   install -D ${_pkgname}/custom/conf/app.ini.sample "${pkgdir}"/etc/gitea/app.ini
 }
 
diff --git a/gitea-arch-defaults.patch b/gitea-arch-defaults.patch
new file mode 100644
index 000000000000..ff1bb2ada9cd
--- /dev/null
+++ b/gitea-arch-defaults.patch
@@ -0,0 +1,49 @@
+--- a/custom/conf/app.ini.sample
++++ b/custom/conf/app.ini.sample
+@@ -7,12 +7,12 @@
+ ; App name that shows in every page title
+ APP_NAME = Gitea: Git with a cup of tea
+ ; Change it if you run locally
+-RUN_USER = git
++RUN_USER = gitea
+ ; Either "dev", "prod" or "test", default is "dev"
+-RUN_MODE = dev
++RUN_MODE = prod
+ 
+ [repository]
+-ROOT =
++ROOT = /var/lib/gitea/repos
+ SCRIPT_TYPE = bash
+ ; Default ANSI charset
+ ANSI_CHARSET =
+@@ -236,7 +236,7 @@ SQLITE_TIMEOUT = 500
+ ; For iterate buffer, default is 50
+ ITERATE_BUFFER_SIZE = 50
+ ; Show the database generated SQL
+-LOG_SQL = true
++LOG_SQL = false
+ 
+ [indexer]
+ ISSUE_INDEXER_PATH = indexers/issues.bleve
+@@ -471,10 +471,10 @@ MAX_FILES = 5
+ FORMAT =
+ 
+ [log]
+-ROOT_PATH =
++ROOT_PATH = /var/log/gitea/
+ ; Either "console", "file", "conn", "smtp" or "database", default is "console"
+ ; Use comma to separate multiple modes, e.g. "console, file"
+-MODE = console
++MODE = console, file
+ ; Buffer length of the channel, keep it as it is if you don't know what it is.
+ BUFFER_LEN = 10000
+ ; Either "Trace", "Debug", "Info", "Warn", "Error", "Critical", default is "Trace"
+@@ -482,7 +482,7 @@ LEVEL = Trace
+ 
+ ; For "console" mode only
+ [log.console]
+-LEVEL =
++LEVEL = Info
+ 
+ ; For "file" mode only
+ [log.file]
diff --git a/gitea-repos.patch b/gitea-repos.patch
deleted file mode 100644
index d505dcc56098..000000000000
--- a/gitea-repos.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/custom/conf/app.ini.sample
-+++ b/custom/conf/app.ini.sample
-@@ -12,7 +12,7 @@ RUN_USER = git
- RUN_MODE = dev
- 
- [repository]
--ROOT =
-+ROOT = /var/lib/gitea/repos
- SCRIPT_TYPE = bash
- ; Default ANSI charset
- ANSI_CHARSET =
diff --git a/gitea.install b/gitea.install
new file mode 100644
index 000000000000..08c702f5b133
--- /dev/null
+++ b/gitea.install
@@ -0,0 +1,30 @@
+post_upgrade() {
+    if [ $(vercmp $2 1.6.1-1) -lt 0 ] ; then
+        cat << EOF
+
+gitea now uses its own user/group instead of the git ones.
+Ownership of /var/lib/gitea tree has been changed accordingly.
+You need to update your /etc/gitea/app.ini file to change the
+RUN_USER variable at the top.
+
+Next step is fixing the SSH configuration. If you have:
+    AllowUsers git
+in /etc/ssh/sshd_config, you need to change that to gitea.
+Then restart sshd.service.
+You will need to tell all your users that they have to change
+git@ to gitea@ in their repos clones using git remote set-url.
+
+If you use a PostgreSQL DB upon Unix socket, you need to fix
+your [database] configuration and switch USER to gitea.
+Then, you need to change it also in /var/lib/data/pg_hba.conf.
+Finally, as postgres user, run psql and inside it type:
+    ALTER USER git RENAME TO gitea;
+    \q
+Then restart postgresql.service.
+
+In all cases, you then need to reload systemd units and
+restart gitea.service.
+
+EOF
+    fi
+}
diff --git a/gitea.service b/gitea.service
index 04b27030dc90..5546a8c13925 100644
--- a/gitea.service
+++ b/gitea.service
@@ -8,13 +8,13 @@ After=memcached.service
 After=redis.service
 
 [Service]
-User=git
-Group=git
+User=gitea
+Group=gitea
 Type=simple
-WorkingDirectory=/var/lib/gitea
+WorkingDirectory=~
 RuntimeDirectory=gitea
 LogsDirectory=gitea
-Environment=USER=git HOME=/var/lib/gitea GITEA_WORK_DIR=/var/lib/gitea
+Environment=USER=gitea HOME=/var/lib/gitea GITEA_WORK_DIR=/var/lib/gitea
 ExecStart=/usr/bin/gitea web -c /etc/gitea/app.ini
 Restart=always
 RestartSec=2s
diff --git a/gitea.sysusers b/gitea.sysusers
new file mode 100644
index 000000000000..dad24d65e7b7
--- /dev/null
+++ b/gitea.sysusers
@@ -0,0 +1 @@
+u gitea - "Gitea daemon user" /var/lib/gitea /usr/bin/bash
diff --git a/gitea.tmpfiles b/gitea.tmpfiles
index 51f45bcd4a65..7d92761cd34f 100644
--- a/gitea.tmpfiles
+++ b/gitea.tmpfiles
@@ -1,9 +1,10 @@
-d /var/lib/gitea 0750 git git
-d /var/lib/gitea/attachments 0750 git git
-d /var/lib/gitea/data 0750 git git
-d /var/lib/gitea/indexers 0750 git git
-d /var/lib/gitea/repos 0750 git git
-d /var/lib/gitea/tmp 0750 git git
-d /var/log/gitea 0750 git git
-z /etc/gitea 0755 root git
-z /etc/gitea/app.ini 0660 root git
+d /var/lib/gitea 0750
+d /var/lib/gitea/attachments 0750
+d /var/lib/gitea/data 0750
+d /var/lib/gitea/indexers 0750
+d /var/lib/gitea/repos 0750
+d /var/lib/gitea/tmp 0750
+Z /var/lib/gitea - gitea gitea
+d /var/log/gitea 0750 gitea gitea
+z /etc/gitea 0755 root gitea
+z /etc/gitea/app.ini 0660 root gitea
author	Sam Whited	2018-12-13 09:49:32 -0600
committer	Sam Whited	2018-12-13 10:01:02 -0600
commit	93b8421c2f8a44e89a56a3d36afb5c3a58ea0b39 (patch)
tree	09f72ac45235141282acb957e83b829d3534f2e6
parent	4b1df37b692a138c111c11505bd542d125d9bfca (diff)
download	aur-93b8421c2f8a44e89a56a3d36afb5c3a58ea0b39.tar.gz