Merge branch 'master' into dist/eole/2.6.2/master

pretemplate/01-gitea-init

@@ -47,6 +47,7 @@ fi
 if [[ ! -d ${APPDIR} ]] 
 then
    mkdir -p ${APPDIR}
+   chown ${USER}:${GROUP} ${APPDIR} -R
 fi
 
 # Create app user and group
@@ -70,6 +71,7 @@ chmod 770 ${APPCONFDIR}
 if [[ ! -d ${APPBINDIR} ]]
 then
    mkdir -p ${APPBINDIR}
+   chown ${USER}:${GROUP} ${APPBINDIR}
 fi
 
 cd $APPBINDIR

systemd/forge.service

@@ -14,8 +14,8 @@ RestartSec=2s
 Type=simple
 User=git
 Group=gitservice
-WorkingDirectory=/srv/forge/gitea/bin/gitea
-ExecStart=/srv/forge/gitea/bin/gitea/gitea web
+WorkingDirectory=/srv/forge/gitea/bin/
+ExecStart=/srv/forge/gitea/bin/gitea web -c /etc/gitea/conf/app.ini
 Restart=always
 Environment=USER=git HOME=/srv/forge/git
 #CapabilityBoundingSet=CAP_NET_BIND_SERVICE