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

debian/control

@@ -8,7 +8,7 @@ Homepage: https://forge.cadoles.com/Cadoles/eole-gitea
 Vcs-Git: https://forge.cadoles.com/Cadoles/eole-gitea.git
 Vcs-Browser: https://forge.cadoles.com/Cadoles/eole-redis
 
-Package: eole-gitea
+Package: eole-redis
 Architecture: all
 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

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'/>
@@ -13,13 +14,15 @@
         <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'>
-              <port service_accesslist="gitea_ssh'" port_type="SymLinkOption">gitea_ssh_port</port>
+              <tcpwrapper>sshd</tcpwrapper>
             </service_access>
         </container>
     </containers>

tmpl/gitea-db.yml

@@ -34,7 +34,8 @@ 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,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
@@ -71,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