[arch-commits] Commit in gitea/trunk (7 files)
Bruno Pagani
archange at archlinux.org
Thu Dec 13 00:24:50 UTC 2018
Date: Thursday, December 13, 2018 @ 00:24:49
Author: archange
Revision: 415945
upgpkg: gitea 1.6.1-1
Switch to dedicated user.
Added:
gitea/trunk/gitea-arch-defaults.patch
(from rev 415944, gitea/trunk/gitea-repos.patch)
gitea/trunk/gitea.install
gitea/trunk/gitea.sysusers
Modified:
gitea/trunk/PKGBUILD
gitea/trunk/gitea.service
gitea/trunk/gitea.tmpfiles
Deleted:
gitea/trunk/gitea-repos.patch
---------------------------+
PKGBUILD | 28 ++++++++++++++++---------
gitea-arch-defaults.patch | 49 ++++++++++++++++++++++++++++++++++++++++++++
gitea-repos.patch | 11 ---------
gitea.install | 30 ++++++++++++++++++++++++++
gitea.service | 8 +++----
gitea.sysusers | 1
gitea.tmpfiles | 19 ++++++++---------
7 files changed, 112 insertions(+), 34 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2018-12-13 00:20:38 UTC (rev 415944)
+++ PKGBUILD 2018-12-13 00:24:49 UTC (rev 415945)
@@ -3,7 +3,7 @@
# Contributor: Frederik Schwan <frederik dot schwan at linux dot com>
pkgname=gitea
-pkgver=1.6.0
+pkgver=1.6.1
pkgrel=1
pkgdesc="Painless self-hosted Git service. Community managed fork of Gogs."
arch=('x86_64')
@@ -10,7 +10,7 @@
url="https://gitea.io"
license=('MIT')
depends=('git')
-makedepends=('go-pie' 'go-bindata')
+makedepends=('go-pie' 'go-bindata' 'dep')
optdepends=(
'mariadb: MariaDB support'
'memcached: MemCached support'
@@ -21,32 +21,39 @@
'sqlite: SQLite support'
)
backup=('etc/gitea/app.ini')
-_tag=a60c3a5aa6489523209a388454add00b84178def # tags/1.6.0^0
+_tag=439719da19ac5bd0c104d74b54a9b4a49426382b # git rev-parse v1.6.1
source=("git+https://github.com/go-gitea/gitea.git#tag=${_tag}?signed"
gitea.tmpfiles
gitea.service
- gitea-repos.patch
+ gitea.sysusers
+ gitea-arch-defaults.patch
gitea-ldflags.patch
gitea-disable-u2f.patch)
sha256sums=('SKIP'
- 'f6829347594d424d63bcc211f85effaea90b677960593fe3ca978b3b5a3d12a7'
- '13da15e0e7d9821420e51ea36abdf8a0fe5cbdbf1e702a164d3a93ea7369611e'
- '66c5a84fbbe56dd8b3bca3a779aaaf5d4855573f0dd2b273018a8983d7951a72'
+ '1521fd7edc3830c695698ffe9835709f1408040b5ec989f07410972c894fa8ba'
+ '7789b3f6699b9e111fa080226047cdc765e55ff49a3f72aac989c11c06c3e7e0'
+ '2abc51ccd0086bb996194bb7fb241a3f26d84f518417c872b66a3db8970da7e4'
+ 'db401622ea3d3bde5c1265b4031539a16e5be74191b6109491f539c7e5551f72'
'9357afc653c70f524a4e3c42cc99c1e6bb4ff40a7460391fa283b6fcf3202e7b'
'd6842efd13b6971b77d233ff3ac2bd3d81c5d26c348ae1f2a2b19b0e7237726e')
validpgpkeys=('8C4033A23895237CB27D52D9D9B5613BEB813F99') # Matti Ranta <matti at mdranta.net>, retrieved from https://github.com/techknowlogick.gpg
+install=gitea.install
prepare() {
mkdir -p gopath/src/code.gitea.io
- ln -rTsf ${pkgname} gopath/src/code.gitea.io/${pkgname}
+ ln -rTsf ${pkgname} gopath/src/code.gitea.io/gitea
+ export GOPATH="${srcdir}"/gopath
cd ${pkgname}
- # Change default repos path for ArchLinux
- patch -Np1 -i ../gitea-repos.patch
+ # Change some defaults for ArchLinux
+ 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
+
+ cd $GOPATH/src/code.gitea.io/gitea
+ dep ensure
}
build() {
@@ -62,5 +69,6 @@
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
}
Copied: gitea/trunk/gitea-arch-defaults.patch (from rev 415944, gitea/trunk/gitea-repos.patch)
===================================================================
--- gitea-arch-defaults.patch (rev 0)
+++ gitea-arch-defaults.patch 2018-12-13 00:24:49 UTC (rev 415945)
@@ -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]
Deleted: gitea-repos.patch
===================================================================
--- gitea-repos.patch 2018-12-13 00:20:38 UTC (rev 415944)
+++ gitea-repos.patch 2018-12-13 00:24:49 UTC (rev 415945)
@@ -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 =
Added: gitea.install
===================================================================
--- gitea.install (rev 0)
+++ gitea.install 2018-12-13 00:24:49 UTC (rev 415945)
@@ -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
+}
Modified: gitea.service
===================================================================
--- gitea.service 2018-12-13 00:20:38 UTC (rev 415944)
+++ gitea.service 2018-12-13 00:24:49 UTC (rev 415945)
@@ -8,14 +8,14 @@
After=redis.service
[Service]
-User=git
-Group=git
+User=gitea
+Group=gitea
Type=simple
-WorkingDirectory=/var/lib/gitea
+WorkingDirectory=~
RuntimeDirectory=gitea
LogsDirectory=gitea
StateDirectory=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
Added: gitea.sysusers
===================================================================
--- gitea.sysusers (rev 0)
+++ gitea.sysusers 2018-12-13 00:24:49 UTC (rev 415945)
@@ -0,0 +1 @@
+u gitea - "Gitea daemon user" /var/lib/gitea /usr/bin/bash
Modified: gitea.tmpfiles
===================================================================
--- gitea.tmpfiles 2018-12-13 00:20:38 UTC (rev 415944)
+++ gitea.tmpfiles 2018-12-13 00:24:49 UTC (rev 415945)
@@ -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
More information about the arch-commits
mailing list