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

Makefile

@@ -3,8 +3,8 @@
 ################################
 
 SOURCE=eole-gitea
-VERSION=1.5.2
+VERSION=1.13.2
-EOLE_VERSION=2.6.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'/>
@@ -13,16 +12,14 @@
     <containers>
        <container name='forge' id='101'>
           <package>apt-transport-https</package>
-            <package>git-core</package>
+          <package>git</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>
@@ -40,6 +37,8 @@
              <value>non</value>
           </variable>
           <variable name='gitea_mail_from' type='string' description="Adresse courriel a l'origine des messages de la forge"/>
+          <variable name='gitea_smtp_srv' type='string' description="Adresse IP ou DNS du serveur SMTP à utiliser"/>
+          <variable name='gitea_smtp_prt' type='port' description="Port du serveur SMTP à utiliser"/>
           <variable name='gitea_mail_auth' type='oui/non' description="Utiliser un compte pour le serveur smtp">
              <value>non</value>
           </variable>
@@ -80,6 +79,10 @@
        <condition name='hidden_if_in' source='gitea_mail'>
           <param>non</param>
           <target type='variable'>gitea_mail_from</target>
+          <target type='variable'>gitea_smtp_srv</target>
+          <target type='variable'>gitea_smtp_prt</target>
+          <target type='variable'>gitea_email_user</target>
+          <target type='variable'>gitea_email_password</target>
        </condition>
        <condition name='disabled_if_in' source='activer_gitea'>
           <param>non</param>

pretemplate/01-gitea-init

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

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

@@ -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
@@ -59,18 +60,18 @@ DB_TYPE = mysql
 %set %%dbMode = %%getVar("gitea_db_mode")
 %if %%dbMode == "default"
    %if %%edb_local == "oui"
-HOST = 127.0.0.1:3306
+HOST = /var/run/mysqld/mysqld.sock
    %else
 HOST = %%{edb_host}:%%{edb_port}
    %end if
 %elif %%dbMode == "local"
-HOST = 127.0.0.1:3306
+HOST = /var/run/mysqld/mysqld.sock
 %elif %%dbMode == "externe"
 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
@@ -136,11 +137,7 @@ SUBJECT = %(APP_NAME)s
 ; Gmail: smtp.gmail.com:587
 ; QQ: smtp.qq.com:25
 ; Note, if the port ends with "465", SMTPS will be used. Using STARTTLS on port 587 is recommended per RFC 6409. If the server supports STARTTLS it will always be used.
-   %if %%getVar('activer_exim_relay_smtp','non') == 'oui'
+HOST = %%gitea_smtp_srv:%%gitea_srv_prt
-HOST = %%exim_relay_smtp:25
-   %else
-HOST = 127.0.0.1
-   %end if
 ; Do not verify the certificate of the server. Only use this for self-signed certificates
 SKIP_VERIFY = true
 ; Use client certificate