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

Check for version update with script expected version versus installed
version

pretemplate/01-gitea-init

@@ -16,7 +16,7 @@ HOMEDIR="${WKDIR}/${USER}"
 OS="linux"
 ARCH="amd64"
 
-APPVERSION="1.8.2"
+APPVERSION="1.8.3"
 APPNAME="gitea"
 APPBINARY="gitea"
 APPSIG="7C9E68152594688862D62AF62D9AE806EC1592E2"
@@ -42,25 +42,20 @@ function configure_proxy {
 
 function create_app_dir {
    
-   if [[ ! -d ${APPDIR} ]] 
+   mkdir -p "${APPDIR}"
-   then
+   chown ${USER}:${GROUP} "${APPDIR}" -R
-      mkdir -p ${APPDIR}
-      chown ${USER}:${GROUP} ${APPDIR} -R
-   fi
 
    # Create app structure
    mkdir -p ${APPDIR}/{custom,data,indexers,public,log}
    chown ${USER}:${GROUP} ${APPDIR}/{data,indexers,log}
    chmod 750 ${APPDIR}/{data,indexers,log}
-   mkdir -p ${APPCONFDIR}
+   mkdir -p "${APPCONFDIR}"
    chown root:${GROUP} ${APPCONFDIR}
-   chmod 770 ${APPCONFDIR}
+   chmod 770 "${APPCONFDIR}"
+
+   mkdir -p "${APPBINDIR}"
+   chown ${USER}:${GROUP} "${APPBINDIR}"
 
-   if [[ ! -d ${APPBINDIR} ]]
-   then
-      mkdir -p ${APPBINDIR}
-      chown ${USER}:${GROUP} ${APPBINDIR}
-   fi
 }
 
 function create_user_and_group {

tmpl/gitea-db.yml

@@ -34,8 +34,7 @@ createscript: "/usr/share/eole/db/gitea/gen/00-create-gitea-db.sql"
 %set cnt_prefix = %%getVar('container_path_reseau', '')
 pwd_files:
     - {file: '%%cnt_prefix/etc/gitea/conf/app.ini',
-       pattern: 'PASSWD   = ',
+       pattern: 'PASSWD   = `',
-       end_pattern: '',
+       end_pattern: '`',
        owner: 'root:gitservice',
        mod: '660' }
-

tmpl/gitea.conf

@@ -70,7 +70,7 @@ HOST = %%{gitea_dbserver}:%%{gitea_dbport}
 %end if
 NAME = gitea
 USER = gitea 
-PASSWD   = gitea1234
+PASSWD   = `gitea1234`
 ; For "postgres" only, either "disable", "require" or "verify-full"
 SSL_MODE = disable
 ; For "sqlite3" only