dicos/50_gitea.xml

@@ -37,8 +37,6 @@
             <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>
@@ -79,10 +77,6 @@
         <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>

tmpl/gitea.conf

@@ -137,7 +137,11 @@ 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.
-HOST = %%gitea_smtp_srv:%%gitea_srv_prt
+   %if %%getVar('activer_exim_relay_smtp','non') == 'oui'
+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