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

Makefile

@@ -3,8 +3,8 @@
 ################################
 
 SOURCE=eole-gitea
-VERSION=1.13.2
-EOLE_VERSION=2.7.2
+VERSION=1.5.2
+EOLE_VERSION=2.6.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, eole-db, eole-mysql
+Depends: ${misc:Depends}, git-core, 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,6 +1,7 @@
 <?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'/>
@@ -12,14 +13,16 @@
     <containers>
         <container name='forge' id='101'>
             <package>apt-transport-https</package>
-            <package>git</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'>
-              <port service_accesslist="gitea_ssh'" port_type="SymLinkOption">gitea_ssh_port</port>
+              <tcpwrapper>sshd</tcpwrapper>
             </service_access>
         </container>
     </containers>

pretemplate/01-gitea-init

@@ -16,7 +16,7 @@ HOMEDIR="${WKDIR}/${USER}"
 OS="linux"
 ARCH="amd64"
 
-APPVERSION="1.10.0"
+APPVERSION="1.8.3"
 APPNAME="gitea"
 APPBINARY="gitea"
 APPSIG="7C9E68152594688862D62AF62D9AE806EC1592E2"
@@ -132,4 +132,4 @@ function main {
    
 }
 
-main
+main

tmpl/gitea.conf

@@ -30,7 +30,6 @@ 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
@@ -60,12 +59,12 @@ DB_TYPE = mysql
 %set %%dbMode = %%getVar("gitea_db_mode")
 %if %%dbMode == "default"
    %if %%edb_local == "oui"
-HOST = /var/run/mysqld/mysqld.sock
+HOST = 127.0.0.1:3306
    %else
 HOST = %%{edb_host}:%%{edb_port}
    %end if
 %elif %%dbMode == "local"
-HOST = /var/run/mysqld/mysqld.sock
+HOST = 127.0.0.1:3306
 %elif %%dbMode == "externe"
 HOST = %%{gitea_dbserver}:%%{gitea_dbport}
 %end if