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

Makefile

@@ -1,5 +1,5 @@
 ################################
-# Makefile pour eole-gogs
+# Makefile pour eole-gitea
 ################################
 
 SOURCE=eole-gitea

dicos/50_gitea.xml

@@ -4,7 +4,8 @@
         <!-- 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='/usr/share/eole/mysql/eole-gitea/gen/00-create-gitea-db.sql' mkdir='True' rm='True'/>
+        <file filelist='gitea' name='/etc/eole/eole-db.d/gitea-db.yml' rm='True' mkdir='True'/>
+        <file filelist='gitea' name='/usr/share/eole/db/gitea/gen/00-create-gitea-db.sql' mkdir='True' rm='True'/>
         <service_access service='gitea_with_nginx'>
           <port service_accesslist="gitea_with_nginx">443</port>
         </service_access>
@@ -14,7 +15,7 @@
             <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'/>
+            <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'>
@@ -39,11 +40,11 @@
             <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_mail_auth' type='oui/non' description="Utiliser un compte pour le serveur smtp">
+		      <variable name='gitea_mail_auth' type='oui/non' description="Utiliser un compte pour le serveur smtp">
-			  <value>non</value>
+		    	  <value>non</value>
-		  </variable>
+	    	  </variable>
-		  <variable name='gitea_email_user' type='string' description="Nom de l'utilisateur SMTP"/>
+		      <variable name='gitea_email_user' type='string' description="Nom de l'utilisateur SMTP"/>
-		  <variable name='gitea_email_password' type='string' description="Mot de passe de l'utilisateur"/>
+		      <variable name='gitea_email_password' type='string' description="Mot de passe de l'utilisateur"/>
 
           <variable name='gitea_web_name' type='string' description='Nom DNS de la forge' mandatory='True'/>
           <variable name='git_root' type='string' description='Repertoire des dépôts git' mandatory='True'>
@@ -64,7 +65,15 @@
           <variable name='gitea_domain' type='string' description='Domaine git ... fixme ...' mode='expert'>
             <value>localhost</value>
           </variable>
-		  <variable name='gitea_nginx' type='oui/non' hidden='True'/>
+		      <variable name='gitea_nginx' type='oui/non' hidden='True'/>
+          <variable type='string' name='gitea_db_mode' description='Serveur de bases de données à utiliser'/>
+        </family>
+        <family name="BDD Forge" mode="expert">
+          <variable type='string' name='gitea_dbserver' description='Adresse du serveur de base de données'/>
+          <variable type='number' name='gitea_dbport' description="Port d'écoute du serveur de base de données"/>
+          <variable type='string' name='gitea_allow_hosts' description="Hôtes authorisés à utiliser la base de données" multi='True'/>
+          <variable type='string' name='gitea_dbuser' description='Utilisateur du serveur de base de données'/>
+          <variable type='string' name='gitea_dbpass' description='Fichier de mot de passe du serveur'/>
         </family>
     </variables>
     <constraints>
@@ -85,14 +94,16 @@
 			<target type='variable'>gitea_email_user</target>
 			<target type='variable'>gitea_email_password</target>
 		</condition>
-        <fill name='calc_multi_condition' target='gitea_nginx'>
+    <fill name='calc_multi_condition' target='gitea_nginx'>
             <param>oui</param>
             <param name="operator">OR</param>
-            <param type="eole" name="condition_1" optional="True">activer_revprox</param>
+            <param type="eole" name="condition_1" optional="True">activer_nginx_web</param>
             <param name="condition_2">non</param>
             <param name='match'>oui</param>
             <param name='mismatch'>non</param>
         </fill>
+
+        
         <condition name='disabled_if_in' source='gitea_nginx'>
           <param>non</param>
           <target type='filelist'>gitea-nginx</target>
@@ -102,6 +113,18 @@
           <param>oui</param>
           <target type='service_accesslist'>gitea_without_nginx</target>
         </condition>
+
+        <check name='valid_enum' target='gitea_db_mode'>
+            <param>['default', 'externe', 'local']</param>
+        </check>
+        <condition name='disabled_if_in' source='gitea_db_mode'>
+            <param>local</param>
+            <target type='family'>BDD Forge</target>
+        </condition>
+        <condition name='disabled_if_in' source='gitea_db_mode'>
+            <param>default</param>
+            <target type='family'>BDD Forge</target>
+        </condition>
     </constraints>
     <help>
         <variable name='activer_gitea'>Activer la forge Gitea, Gitea est une forge basée sur Git clone de github (fork de gogs)</variable>

posttemplate/01-gitea-nginx

@@ -1,11 +1,11 @@
 #!/bin/bash
 
-ENABLE=`CreoleGet activer_gogs 'non'`
+ENABLE=`CreoleGet activer_gitea 'non'`
 
-if [ -L /etc/nginx/sites-enabled/gogs ];then
+if [ -L /etc/nginx/sites-enabled/gitea ];then
-    rm -f /etc/nginx/sites-enabled/gogs
+    rm -f /etc/nginx/sites-enabled/gitea
 fi
 
 if [ "${ENABLE}" = 'oui' ];then
-    ln -s /etc/nginx/sites-available/gogs /etc/nginx/sites-enabled/gogs
+    ln -s /etc/nginx/sites-available/gitea /etc/nginx/sites-enabled/gitea
 fi

tmpl/00-create-gitea-db.sql

@@ -1,13 +1,13 @@
 -- example de création d'une base de données MySQL
 -- création de la base de donnée
-CREATE DATABASE gogs CHARACTER SET utf8 COLLATE utf8_general_ci;
+CREATE DATABASE gitea CHARACTER SET utf8 COLLATE utf8_general_ci;
 
 -- création du user de la base
-grant all privileges on gogs.* to gogs@%%container_ip_forge identified by 'gogs1234';
+grant all privileges on gitea.* to gitea@%%container_ip_forge identified by 'gitea1234';
 flush privileges ;
 
 -- connexion à la base
-\r gogs
+\r gitea
 
 SET SQL_MODE="NO_AUTO_VALUE_ON_ZERO";
 

tmpl/gitea-db.yml

@@ -34,8 +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="',
+       pattern: 'PASSWD   = ',
-       end_pattern: ';',
+       end_pattern: '',
-       owner: 'root:www-data',
+       owner: 'root:gitservice',
        mod: '660' }
 

tmpl/gitea.conf

@@ -56,7 +56,18 @@ LANDING_PAGE = explore
 ; Either "mysql", "postgres" or "sqlite3", it's your choice
 DB_TYPE = mysql
 ;FIXME FOR EOLEDB
-HOST = %%getVar("container_ip_mysql","127.0.0.1"):3306
+%set %%dbMode = %%getVar("gitea_db_mode")
+%if %%dbMode == "default"
+   %if %%edb_local == "oui"
+HOST = 127.0.0.1:3306
+   %else
+HOST = %%{edb_host}:%%{edb_port}
+   %end if
+%elif %%dbMode == "local"
+HOST = 127.0.0.1:3306
+%elif %%dbMode == "externe"
+HOST = %%{gitea_dbserver}:%%{gitea_dbport}
+%end if
 NAME = gitea
 USER = gitea 
 PASSWD=gitea1234