CVS commit: pkgsrc/www/gitea

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Sun Aug  4 12:26:59 UTC 2019

Modified Files:
        pkgsrc/www/gitea: Makefile
        pkgsrc/www/gitea/files: gitea.sh

Log Message:
gitea: Fix config file handling.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 pkgsrc/www/gitea/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/www/gitea/files/gitea.sh

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/www/gitea/Makefile
diff -u pkgsrc/www/gitea/Makefile:1.6 pkgsrc/www/gitea/Makefile:1.7
--- pkgsrc/www/gitea/Makefile:1.6       Sun Aug  4 11:39:53 2019
+++ pkgsrc/www/gitea/Makefile   Sun Aug  4 12:26:59 2019
@@ -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"
 

Index: pkgsrc/www/gitea/files/gitea.sh
diff -u pkgsrc/www/gitea/files/gitea.sh:1.1 pkgsrc/www/gitea/files/gitea.sh:1.2
--- pkgsrc/www/gitea/files/gitea.sh:1.1 Sun Mar 24 21:34:23 2019
+++ pkgsrc/www/gitea/files/gitea.sh     Sun Aug  4 12:26:59 2019
@@ -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@"