Cadoles
/
eole-gitea
20
0
Fork 0
Code Issues 3 Pull Requests Releases Wiki Activity

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

This commit is contained in:
Philippe Caseiro 2021-03-24 15:36:06 +01:00
parent 2acdd20428 487bcb6f0d
commit 4513cb54a3
2 changed files with 82 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dicos/50_gitea.xml
View File

@ -37,6 +37,8 @@
<value>non</value> <value>non</value>
</variable> </variable>
<variable name='gitea_mail_from' type='string' description="Adresse courriel a l'origine des messages de la forge"/> <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"> <variable name='gitea_mail_auth' type='oui/non' description="Utiliser un compte pour le serveur smtp">
<value>non</value> <value>non</value>
</variable> </variable>
@ -77,6 +79,10 @@
<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>
<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>
<condition name='disabled_if_in' source='activer_gitea'> <condition name='disabled_if_in' source='activer_gitea'>
<param>non</param> <param>non</param>

6
tmpl/gitea.conf
View File

@ -137,11 +137,7 @@ SUBJECT = %(APP_NAME)s
; Gmail: smtp.gmail.com:587 ; Gmail: smtp.gmail.com:587
; QQ: smtp.qq.com:25 ; 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. ; 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 ; Do not verify the certificate of the server. Only use this for self-signed certificates
SKIP_VERIFY = true SKIP_VERIFY = true
; Use client certificate ; Use client certificate