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

dicos/50_gitea.xml

@@ -10,118 +10,124 @@
         </service_access>
     </files>
     <containers>
-        <container name='forge' id='101'>
+       <container name='forge' id='101'>
-            <package>apt-transport-https</package>
+          <package>apt-transport-https</package>
-            <package>git</package>
+          <package>git</package>
-            <file filelist='gitea' name='/etc/gitea/conf/app.ini' source='gitea.conf' mkdir='True' rm='True' mode='770' owner='root' group='gitservice'/>
+          <file filelist='gitea' name='/etc/gitea/conf/app.ini' source='gitea.conf' mkdir='True' rm='True' mode='770' owner='root' group='gitservice'/>
-            <service servicelist='gitea'>forge</service>
+          <service servicelist='gitea'>forge</service>
-            <service_access service='gitea_without_nginx'>
+          <service_access service='gitea_without_nginx'>
-              <port service_accesslist="gitea_without_nginx" port_type="SymLinkOption">gitea_http_port</port>
+             <port service_accesslist="gitea_without_nginx" port_type="SymLinkOption">gitea_http_port</port>
-            </service_access>
+          </service_access>
-            <service_access service='gitea_ssh'>
+          <service_access service='gitea_ssh'>
-              <port service_accesslist="gitea_ssh'" port_type="SymLinkOption">gitea_ssh_port</port>
+             <port service_accesslist="gitea_ssh'" port_type="SymLinkOption">gitea_ssh_port</port>
-            </service_access>
+          </service_access>
-        </container>
+       </container>
     </containers>
     <variables>
-        <family name='services'>
+       <family name='services'>
           <variable name='activer_gitea' type='oui/non' description='Activer la forge Gitea'>
-                <value>non</value>
+             <value>non</value>
-            </variable>
+          </variable>
-        </family>
+       </family>
-        <family name='forge'>
+       <family name='forge'>
           <variable name='gitea_name' type='string' description='Nom de la forge' mandatory='True'>
-            <value>Forge Numérique EOLE</value>
+             <value>Forge Numérique EOLE</value>
           </variable>
           <variable name='gitea_mail' type='oui/non' description="Activer l'envois de courriels">
-            <value>non</value>
+             <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_smtp_srv' type='string' description="Adresse IP ou DNS du serveur SMTP à utiliser"/>
-		    	  <value>non</value>
+          <variable name='gitea_smtp_prt' type='port' description="Port du serveur SMTP à utiliser"/>
-	    	  </variable>
+          <variable name='gitea_mail_auth' type='oui/non' description="Utiliser un compte pour le serveur smtp">
-		      <variable name='gitea_email_user' type='string' description="Nom de l'utilisateur SMTP"/>
+             <value>non</value>
-		      <variable name='gitea_email_password' type='string' description="Mot de passe de l'utilisateur"/>
+          </variable>
+          <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_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'>
-            <value>/srv/forge/git</value>
+             <value>/srv/forge/git</value>
           </variable>
           <variable name='gitea_registration' type='oui/non' description="Les utilisateurs peuvent s'enregistrer">
-            <value>non</value>
+             <value>non</value>
           </variable>
           <variable name='gitea_http_port' type='string' description='Port HTTP pour la forge' mode='expert'>
-            <value>6000</value>
+             <value>6000</value>
           </variable>
           <variable name='gitea_ssh_port' type='string' description='Port SSH pour la forge' mode='expert'>
-            <value>2222</value>
+             <value>2222</value>
           </variable>
           <variable name='gitea_db_file' type='string' description='Fichier de base de données' mode='expert'>
-            <value>/var/db/gitea/gitea.db</value>
+             <value>/var/db/gitea/gitea.db</value>
           </variable>
           <variable name='gitea_domain' type='string' description='Domaine git ... fixme ...' mode='expert'>
-            <value>localhost</value>
+             <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>
-        <family name="BDD Forge" mode="expert">
+       <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>
+       </family>
     </variables>
     <constraints>
-        <condition name='hidden_if_in' source='gitea_mail'>
+       <condition name='hidden_if_in' source='gitea_mail'>
-            <param>non</param>
+          <param>non</param>
-            <target type='variable'>gitea_mail_from</target>
+          <target type='variable'>gitea_mail_from</target>
-        </condition>
+          <target type='variable'>gitea_smtp_srv</target>
-        <condition name='disabled_if_in' source='activer_gitea'>
+          <target type='variable'>gitea_smtp_prt</target>
-            <param>non</param>
+          <target type='variable'>gitea_email_user</target>
-            <target type='filelist'>gitea</target>
+          <target type='variable'>gitea_email_password</target>
-            <target type='filelist'>gitea-nginx</target>
+       </condition>
-            <target type='servicelist'>gitea</target>
+       <condition name='disabled_if_in' source='activer_gitea'>
-            <target type='family'>forge</target>
+          <param>non</param>
-            <target type='service_accesslist'>gitea_ssh</target>
+          <target type='filelist'>gitea</target>
-        </condition>
+          <target type='filelist'>gitea-nginx</target>
-		<condition name='disabled_if_in' source='gitea_mail_auth'>
+          <target type='servicelist'>gitea</target>
-			<param>non</param>
+          <target type='family'>forge</target>
-			<target type='variable'>gitea_email_user</target>
+          <target type='service_accesslist'>gitea_ssh</target>
-			<target type='variable'>gitea_email_password</target>
+       </condition>
-		</condition>
+       <condition name='disabled_if_in' source='gitea_mail_auth'>
-    <fill name='calc_multi_condition' target='gitea_nginx'>
+          <param>non</param>
-            <param>oui</param>
+          <target type='variable'>gitea_email_user</target>
-            <param name="operator">OR</param>
+          <target type='variable'>gitea_email_password</target>
-            <param type="eole" name="condition_1" optional="True">activer_nginx_web</param>
+       </condition>
-            <param name="condition_2">non</param>
+       <fill name='calc_multi_condition' target='gitea_nginx'>
-            <param name='match'>oui</param>
+          <param>oui</param>
-            <param name='mismatch'>non</param>
+          <param name="operator">OR</param>
-        </fill>
+          <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'>
+       <condition name='disabled_if_in' source='gitea_nginx'>
           <param>non</param>
           <target type='filelist'>gitea-nginx</target>
           <target type='service_accesslist'>gitea_with_nginx</target>
-        </condition>
+       </condition>
-        <condition name='disabled_if_in' source='gitea_nginx'>
+       <condition name='disabled_if_in' source='gitea_nginx'>
           <param>oui</param>
           <target type='service_accesslist'>gitea_without_nginx</target>
-        </condition>
+       </condition>
 
-        <check name='valid_enum' target='gitea_db_mode'>
+       <check name='valid_enum' target='gitea_db_mode'>
-            <param>['default', 'externe', 'local']</param>
+          <param>['default', 'externe', 'local']</param>
-        </check>
+       </check>
-        <condition name='disabled_if_in' source='gitea_db_mode'>
+       <condition name='disabled_if_in' source='gitea_db_mode'>
-            <param>local</param>
+          <param>local</param>
-            <target type='family'>BDD Forge</target>
+          <target type='family'>BDD Forge</target>
-        </condition>
+       </condition>
-        <condition name='disabled_if_in' source='gitea_db_mode'>
+       <condition name='disabled_if_in' source='gitea_db_mode'>
-            <param>default</param>
+          <param>default</param>
-            <target type='family'>BDD Forge</target>
+          <target type='family'>BDD Forge</target>
-        </condition>
+       </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>

tmpl/gitea.conf

@@ -137,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