From dcea393793dff21535fb0488f7e1cd24194816e7 Mon Sep 17 00:00:00 2001 From: "Daniel A. Maierhofer" Date: Sat, 10 Mar 2018 16:03:29 +0100 Subject: [PATCH] gitea: update to 1.3.3 add all absolute paths, add GITEA_WORK_DIR, use sqlite Closes: #11447 [via git-merge-pr] --- srcpkgs/gitea/files/gitea/run | 2 +- srcpkgs/gitea/patches/daemon_config.patch | 71 +++++++++++++++++++---- srcpkgs/gitea/template | 6 +- 3 files changed, 64 insertions(+), 15 deletions(-) diff --git a/srcpkgs/gitea/files/gitea/run b/srcpkgs/gitea/files/gitea/run index 76a43ae8e1b..a487c1bbed1 100755 --- a/srcpkgs/gitea/files/gitea/run +++ b/srcpkgs/gitea/files/gitea/run @@ -3,4 +3,4 @@ # The USER variable is needed here because gitea doesn't actually # check what user its running as, it instead grabs the USER variable # from the environment. HOME is set for the same reasons. -USER=_gitea HOME=/var/lib/gitea exec chpst -u _gitea:_gitea gitea web --config /etc/gitea.conf +USER=_gitea HOME=/var/lib/gitea GITEA_WORK_DIR=$HOME exec chpst -u _gitea:_gitea gitea web --config /etc/gitea.conf diff --git a/srcpkgs/gitea/patches/daemon_config.patch b/srcpkgs/gitea/patches/daemon_config.patch index fd9867cf36c..4281dcb4c0c 100644 --- a/srcpkgs/gitea/patches/daemon_config.patch +++ b/srcpkgs/gitea/patches/daemon_config.patch @@ -16,12 +16,19 @@ SCRIPT_TYPE = bash ; Default ANSI charset ANSI_CHARSET = -@@ -42,7 +42,7 @@ +@@ -36,13 +36,13 @@ + + [repository.local] + ; Path for uploads. Defaults to `tmp/local-repo` +-LOCAL_COPY_PATH = tmp/local-repo ++LOCAL_COPY_PATH = /var/lib/gitea/tmp/local-repo + + [repository.upload] ; Whether repository file uploads are enabled. Defaults to `true` ENABLED = true ; Path for uploads. Defaults to `data/tmp/uploads` (tmp gets deleted on gitea restart) -TEMP_PATH = data/tmp/uploads -+TEMP_PATH = /var/lib/gitea/tmp/uploads ++TEMP_PATH = /var/lib/gitea/data/tmp/uploads ; One or more allowed types, e.g. image/jpeg|image/png. Nothing means any file type ALLOWED_TYPES = ; Max size of each file in MB. Defaults to 3MB @@ -34,7 +41,7 @@ ; Local (DMZ) URL for Gitea workers (such as SSH update) accessing web service. ; In most cases you do not need to change the default value. ; Alter it only if your SSH server node is not the same as HTTP node. -@@ -120,11 +120,11 @@ +@@ -120,7 +120,7 @@ ; Network interface builtin SSH server listens on SSH_LISTEN_HOST = ; Port number to be exposed in clone URL @@ -43,11 +50,6 @@ ; 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 = /var/lib/gitea/ssh - ; For built-in SSH server only, choose the ciphers to support for SSH connections, - ; for system SSH this setting has no effect - SSH_SERVER_CIPHERS = aes128-ctr, aes192-ctr, aes256-ctr, aes128-gcm@openssh.com, arcfour256, arcfour128 @@ -146,7 +146,7 @@ ; Indicate whether to check minimum key size with corresponding type MINIMUM_KEY_SIZE_CHECK = false @@ -57,6 +59,23 @@ DISABLE_ROUTER_LOG = false ; Generate steps: ; $ ./gitea cert -ca=true -duration=8760h0m0s -host=myhost.example.com +@@ -155,13 +155,13 @@ + ; not forget to export the private key): + ; $ openssl pkcs12 -in cert.pfx -out cert.pem -nokeys + ; $ openssl pkcs12 -in cert.pfx -out key.pem -nocerts -nodes +-CERT_FILE = custom/https/cert.pem +-KEY_FILE = custom/https/key.pem ++CERT_FILE = /var/lib/gitea/custom/https/cert.pem ++KEY_FILE = /var/lib/gitea/custom/https/key.pem + ; Upper level of template and static file path + ; default is the path where Gitea is executed + STATIC_ROOT_PATH = + ; Default path for App data +-APP_DATA_PATH = data ++APP_DATA_PATH = /var/lib/gitea/data + ; Application level GZIP support + ENABLE_GZIP = false + ; Landing page for non-logged users, can be "home" or "explore" @@ -169,7 +169,7 @@ ; Enables git-lfs support. true or false, default is false. LFS_START_SERVER = false @@ -66,7 +85,16 @@ ; LFS authentication secret, changed this to yourself. LFS_JWT_SECRET = -@@ -190,14 +190,14 @@ +@@ -182,7 +182,7 @@ + + [database] + ; Either "mysql", "postgres", "mssql" or "sqlite3", it's your choice +-DB_TYPE = mysql ++DB_TYPE = sqlite3 + HOST = 127.0.0.1:3306 + NAME = gitea + USER = root +@@ -190,17 +190,17 @@ ; For "postgres" only, either "disable", "require" or "verify-full" SSL_MODE = disable ; For "sqlite3" and "tidb", use absolute path when you start as service @@ -82,7 +110,11 @@ +ISSUE_INDEXER_PATH = /var/lib/gitea/indexers/issues.bleve ; repo indexer by default disabled, since it uses a lot of disk space REPO_INDEXER_ENABLED = false - REPO_INDEXER_PATH = indexers/repos.bleve +-REPO_INDEXER_PATH = indexers/repos.bleve ++REPO_INDEXER_PATH = /var/lib/gitea/indexers/repos.bleve + UPDATE_BUFFER_LEN = 20 + MAX_FILE_SIZE = 1048576 + @@ -212,7 +212,7 @@ ; Whether the installer is disabled INSTALL_LOCK = false @@ -92,6 +124,17 @@ ; Auto-login remember days LOGIN_REMEMBER_DAYS = 7 COOKIE_USERNAME = gitea_awesome +@@ -324,8 +324,8 @@ + SKIP_VERIFY = + ; Use client certificate + USE_CERTIFICATE = false +-CERT_FILE = custom/mailer/cert.pem +-KEY_FILE = custom/mailer/key.pem ++CERT_FILE = /var/lib/gitea/custom/mailer/cert.pem ++KEY_FILE = /var/lib/gitea/custom/mailer/key.pem + ; Mail from address, RFC 5322. This can be just an email address, or the `"Name" ` format + FROM = + ; Mailer user name and password @@ -355,13 +355,13 @@ [session] @@ -108,7 +151,7 @@ ; Session cookie name COOKIE_NAME = i_like_gitea ; If you use session in https only, default is false -@@ -374,7 +374,7 @@ +@@ -374,12 +374,12 @@ SESSION_LIFE_TIME = 86400 [picture] @@ -117,6 +160,12 @@ ; Chinese users can choose "duoshuo" ; or a custom avatar source, like: http://cn.gravatar.com/avatar/ GRAVATAR_SOURCE = gravatar + ; This value will be forced to be true in offline mode. +-DISABLE_GRAVATAR = false ++DISABLE_GRAVATAR = true + ; Federated avatar lookup uses DNS to discover avatar associated + ; with emails, see https://www.libravatar.org + ; This value will be forced to be false in offline mode or Gravatar is disabled. @@ -389,7 +389,7 @@ ; Whether attachments are enabled. Defaults to `true` ENABLE = true diff --git a/srcpkgs/gitea/template b/srcpkgs/gitea/template index 98f390b7a0b..94a043bb3ea 100644 --- a/srcpkgs/gitea/template +++ b/srcpkgs/gitea/template @@ -1,7 +1,7 @@ # Template file for 'gitea' pkgname=gitea -version=1.3.2 -revision=2 +version=1.3.3 +revision=1 build_style=go go_import_path="code.gitea.io/gitea" # This could be done with build options, but these are built in with the @@ -28,7 +28,7 @@ maintainer="Michael Aldridge " license="MIT" homepage="http://gitea.io" distfiles="https://github.com/go-gitea/gitea/archive/v${version}.tar.gz" -checksum=9a351e41aabc0870d435caf2f09d2a76652e67c901ca0156e29e4b87eccc15ff +checksum=998da8ef24487b455641cb544717a6fac8f8e58fa2f392426b3211d02b1462e3 system_accounts="_gitea" _gitea_homedir="/var/lib/gitea"