summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornia <nia@pkgsrc.org>2019-08-04 12:26:59 +0000
committernia <nia@pkgsrc.org>2019-08-04 12:26:59 +0000
commit760bb03eb5be7d2cf88f40b871d20528a0f00bf6 (patch)
treed7dca0e7633fc7bea7cfc394a6c4af0fa3351b30
parent98d44ff74293680124cdb421492bc1848abdeb47 (diff)
downloadpkgsrc-760bb03eb5be7d2cf88f40b871d20528a0f00bf6.tar.gz
gitea: Fix config file handling.
-rw-r--r--www/gitea/Makefile5
-rw-r--r--www/gitea/files/gitea.sh4
2 files changed, 5 insertions, 4 deletions
diff --git a/www/gitea/Makefile b/www/gitea/Makefile
index 6cb253c5fe0..40313b0ba8b 100644
--- a/www/gitea/Makefile
+++ b/www/gitea/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2019/08/04 11:39:53 nia Exp $
+# $NetBSD: Makefile,v 1.7 2019/08/04 12:26:59 nia Exp $
DISTNAME= gitea-1.9.0
MASTER_SITES= ${MASTER_SITE_GITHUB:=go-gitea/}
@@ -65,7 +65,8 @@ SUBST_VARS.fix-var= VARBASE GITEA_USER
MAKE_DIRS+= ${PKG_SYSCONFDIR}/conf
-CONF_FILES+= ${EGDIR}/app.ini.sample ${PKG_SYSCONFDIR}/conf/app.ini
+CONF_FILES_PERMS+= ${EGDIR}/app.ini.sample ${PKG_SYSCONFDIR}/conf/app.ini \
+ ${GITEA_USER} ${GITEA_GROUP} 0600
.include "../../mk/bsd.prefs.mk"
diff --git a/www/gitea/files/gitea.sh b/www/gitea/files/gitea.sh
index 82134d11280..db71ad84295 100644
--- a/www/gitea/files/gitea.sh
+++ b/www/gitea/files/gitea.sh
@@ -1,6 +1,6 @@
#!@RCD_SCRIPTS_SHELL@
#
-# $NetBSD: gitea.sh,v 1.1 2019/03/24 21:34:23 nia Exp $
+# $NetBSD: gitea.sh,v 1.2 2019/08/04 12:26:59 nia Exp $
#
# PROVIDE: gitea
# REQUIRE: DAEMON
@@ -11,7 +11,7 @@ name="gitea"
rcvar=${name}
required_files="@PKG_SYSCONFDIR@/conf/app.ini"
command="@PREFIX@/sbin/gitea"
-command_args="--config @PKG_SYSCONFDIR@/app.ini web &"
+command_args="--config @PKG_SYSCONFDIR@/conf/app.ini web &"
gitea_env="GITEA_WORK_DIR=@GITEA_SHARE_DIR@"
gitea_env="${gitea_env} GITEA_CUSTOM=@PKG_SYSCONFDIR@"