Git package is not called git-core anymore

Check for version update with script expected version versus installed
version

Makefile

@@ -3,8 +3,8 @@
 ################################
 
 SOURCE=eole-gitea
-VERSION=1.5.2
-EOLE_VERSION=2.6.2
+VERSION=1.13.2
+EOLE_VERSION=2.7.2
 PKGAPPS=non
 #FLASK_MODULE=<APPLICATION>
 

debian/control

@@ -10,7 +10,7 @@ Vcs-Browser: https://forge.cadoles.com/Cadoles/eole-redis
 
 Package: eole-gitea
 Architecture: all
-Depends: ${misc:Depends}, git-core, eole-db, eole-mysql
+Depends: ${misc:Depends}, git, eole-db, eole-mysql
 Description: Dictionnaires et templates pour la configuration d'un serveur Gitea, testée uniquement avec eolebase
  .
  Pour toute information complémentaire, veuillez vous rendre sur la forge Cadoles.

dicos/50_gitea.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <creole>
     <files>
-        <!-- Je suis un commentaire -->
         <file filelist='gitea-nginx' name='/etc/nginx/sites-available/gitea' source='gitea.nginx' mkdir='True' rm='True'/>
         <file filelist='gitea' name='/usr/share/eole/bastion/data/51-gitea-nat_rules' mkdir='True' rm='True' mode='0755'/>
         <file filelist='gitea' name='/etc/eole/eole-db.d/gitea-db.yml' rm='True' mkdir='True'/>
@@ -14,15 +13,13 @@
         <container name='forge' id='101'>
             <package>apt-transport-https</package>
             <package>git-core</package>
-            <!-- FIXME this have to be installed <package>gitea</package> -->
             <file filelist='gitea' name='/etc/gitea/conf/app.ini' source='gitea.conf' mkdir='True' rm='True' mode='770' owner='root' group='gitservice'/>
-            <!-- <service servicelist='xxxx'>nom-du-service-a-lancer-dans-le-conteneur</service> -->
             <service servicelist='gitea'>forge</service>
             <service_access service='gitea_without_nginx'>
               <port service_accesslist="gitea_without_nginx" port_type="SymLinkOption">gitea_http_port</port>
             </service_access>
             <service_access service='gitea_ssh'>
-              <tcpwrapper>sshd</tcpwrapper>
+              <port service_accesslist="gitea_ssh'" port_type="SymLinkOption">gitea_ssh_port</port>
             </service_access>
         </container>
     </containers>

pretemplate/01-gitea-init

@@ -16,7 +16,7 @@ HOMEDIR="${WKDIR}/${USER}"
 OS="linux"
 ARCH="amd64"
 
-APPVERSION="1.8.2"
+APPVERSION="1.10.0"
 APPNAME="gitea"
 APPBINARY="gitea"
 APPSIG="7C9E68152594688862D62AF62D9AE806EC1592E2"
@@ -42,25 +42,20 @@ function configure_proxy {
 
 function create_app_dir {
    
-   if [[ ! -d ${APPDIR} ]] 
-   then
-      mkdir -p ${APPDIR}
-      chown ${USER}:${GROUP} ${APPDIR} -R
-   fi
+   mkdir -p "${APPDIR}"
+   chown ${USER}:${GROUP} "${APPDIR}" -R
 
    # 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 {
@@ -137,4 +132,4 @@ function main {
    
 }
 
-main
+main

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   = ',
-       end_pattern: '',
+       pattern: 'PASSWD   = `',
+       end_pattern: '`',
        owner: 'root:gitservice',
        mod: '660' }
-

tmpl/gitea.conf

@@ -30,6 +30,7 @@ HTTP_ADDR =
 HTTP_PORT = %%gitea_http_port
 ; Disable SSH feature when not available
 DISABLE_SSH = false
+START_SSH_SERVER = true
 SSH_PORT = %%gitea_ssh_port
 ; Disable CDN even in "prod" mode
 OFFLINE_MODE = false
@@ -70,7 +71,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