From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 1060413835A for ; Tue, 15 Dec 2020 03:58:55 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1D724E092B; Tue, 15 Dec 2020 03:58:54 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E7CDCE092B for ; Tue, 15 Dec 2020 03:58:53 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 02F5D3412EC for ; Tue, 15 Dec 2020 03:58:53 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id AB33E57 for ; Tue, 15 Dec 2020 03:58:51 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1608004388.ff35a72f142258f0c5b42568f9df4ac5f6482549.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: www-apps/gitea/ X-VCS-Repository: repo/gentoo X-VCS-Files: www-apps/gitea/gitea-9999.ebuild X-VCS-Directories: www-apps/gitea/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: ff35a72f142258f0c5b42568f9df4ac5f6482549 X-VCS-Branch: master Date: Tue, 15 Dec 2020 03:58:51 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 8987a21b-76b0-4edb-940a-71f4242794ed X-Archives-Hash: cc9d15b4ee29ec07172242a943bd05d9 commit: ff35a72f142258f0c5b42568f9df4ac5f6482549 Author: Pierre-Olivier Mercier nemunai re> AuthorDate: Tue Dec 8 09:40:42 2020 +0000 Commit: Sam James gentoo org> CommitDate: Tue Dec 15 03:53:08 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff35a72f www-apps/gitea: follow default upstream configuration changes Signed-off-by: Pierre-Olivier Mercier nemunai.re> Signed-off-by: Sam James gentoo.org> www-apps/gitea/gitea-9999.ebuild | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/www-apps/gitea/gitea-9999.ebuild b/www-apps/gitea/gitea-9999.ebuild index b92bde68e9a..d6f5cfcf5a8 100644 --- a/www-apps/gitea/gitea-9999.ebuild +++ b/www-apps/gitea/gitea-9999.ebuild @@ -33,7 +33,7 @@ RDEPEND="${COMMON_DEPEND} dev-vcs/git" DOCS=( - custom/conf/app.ini.sample CONTRIBUTING.md README.md + custom/conf/app.example.ini CONTRIBUTING.md README.md ) FILECAPS=( cap_net_bind_service+ep usr/bin/gitea @@ -46,7 +46,6 @@ src_prepare() { default local sedcmds=( - -e "s#^RUN_MODE = dev#RUN_MODE = prod#" -e "s#^ROOT =#ROOT = ${EPREFIX}/var/lib/gitea/gitea-repositories#" -e "s#^ROOT_PATH =#ROOT_PATH = ${EPREFIX}/var/log/gitea#" -e "s#^APP_DATA_PATH = data#APP_DATA_PATH = ${EPREFIX}/var/lib/gitea/data#" @@ -55,13 +54,11 @@ src_prepare() { -e "s#^LEVEL = Trace#LEVEL = Info#" -e "s#^LOG_SQL = true#LOG_SQL = false#" -e "s#^DISABLE_ROUTER_LOG = false#DISABLE_ROUTER_LOG = true#" - -e "s#^APP_ID =#;APP_ID =#" - -e "s#^TRUSTED_FACETS =#;TRUSTED_FACETS =#" ) - sed -i "${sedcmds[@]}" custom/conf/app.ini.sample || die + sed -i "${sedcmds[@]}" custom/conf/app.example.ini || die if use sqlite ; then - sed -i -e "s#^DB_TYPE = .*#DB_TYPE = sqlite3#" custom/conf/app.ini.sample || die + sed -i -e "s#^DB_TYPE = .*#DB_TYPE = sqlite3#" custom/conf/app.example.ini || die fi einfo "Remove tests which are known to fail with network-sandbox enabled." @@ -107,7 +104,7 @@ src_install() { systemd_newunit "${FILESDIR}"/gitea.service-r2 gitea.service insinto /etc/gitea - newins custom/conf/app.ini.sample app.ini + newins custom/conf/app.example.ini app.ini if use acct ; then fowners root:git /etc/gitea/{,app.ini} fperms g+w,o-rwx /etc/gitea/{,app.ini}