www-apps/gitea: Use git user by default

Package-Manager: portage-2.3.3

diff --git a/www-apps/gitea/files/gitea.logrotated b/www-apps/gitea/files/gitea.logrotated
index 4ddfdf06bdafc06804778d5998189b8905557e5a..ec6ddfe606b9d73cde1e90260a7183bf124013c2 100644 (file)
--- a/www-apps/gitea/files/gitea.logrotated
+++ b/www-apps/gitea/files/gitea.logrotated
@@ -1,5 +1,5 @@
 /var/log/gitea/* {
-       su gitea gitea
+       su git git
        missingok
        size 5M
        rotate 3

diff --git a/www-apps/gitea/gitea-1.0.0-r1.ebuild b/www-apps/gitea/gitea-1.0.0-r2.ebuild
similarity index 89%
rename from www-apps/gitea/gitea-1.0.0-r1.ebuild
rename to www-apps/gitea/gitea-1.0.0-r2.ebuild
index 8283d50ed3cad3f6a0951985efe10a47073a6579..ca6a3eb6fa8d0e2651618560808fffc196af7e27 100644 (file)
--- a/www-apps/gitea/gitea-1.0.0-r1.ebuild
+++ b/www-apps/gitea/gitea-1.0.0-r2.ebuild
@@ -22,8 +22,8 @@ DEPEND="dev-go/go-bindata"
 RDEPEND="dev-vcs/git"
 
 pkg_setup() {
-       enewgroup gitea
-       enewuser gitea -1 /bin/bash /var/lib/gitea gitea
+       enewgroup git
+       enewuser git -1 /bin/bash /var/lib/gitea git
 }
 
 src_prepare() {
@@ -32,8 +32,7 @@ src_prepare() {
        sed -i -e "s/git rev-parse --short HEAD/echo ${EGIT_COMMIT:0:7}/"\
                -e "s/^LDFLAGS += -X \"main.Version.*$/LDFLAGS += -X \"main.Version=${PV}\"/"\
                -e "s/-ldflags '-s/-ldflags '/" src/${EGO_PN%/*}/Makefile || die
-       sed -i -e "s#RUN_USER = git#RUN_USER = gitea#"\
-               -e "s#^APP_DATA_PATH = data#APP_DATA_PATH = ${GITEA_PREFIX}/data#"\
+       sed -i -e "s#^APP_DATA_PATH = data#APP_DATA_PATH = ${GITEA_PREFIX}/data#"\
                -e "s#^PATH = data/gitea.db#PATH = ${GITEA_PREFIX}/data/gitea.db#"\
                -e "s#^PROVIDER_CONFIG = data/sessions#PROVIDER_CONFIG = ${GITEA_PREFIX}/data/sessions#"\
                -e "s#^AVATAR_UPLOAD_PATH = data/avatars#AVATAR_UPLOAD_PATH = ${GITEA_PREFIX}/data/avatars#"\
@@ -58,5 +57,5 @@ src_install() {
        newinitd "${FILESDIR}"/gitea.initd gitea
        newconfd "${FILESDIR}"/gitea.confd gitea
        keepdir /var/log/gitea /var/lib/gitea/data
-       fowners -R gitea:gitea /var/log/gitea /var/lib/gitea/
+       fowners -R git:git /var/log/gitea /var/lib/gitea/
 }