hosting/ynh-lydra-ansible-yunohost
1
0
Fork 0
Code Issues 2 Activity

Merge branch '97-fix-ynh_config-smtp-enable' into 'main'

Browse source 
Resolve "fix(ynh_config): SMTP enable"

Closes #97

See merge request lydra/yunohost/ansible-yunohost!64
This commit is contained in:
Christophe Chaudier 2023-03-14 14:18:43 +00:00
commit fb1b1aeaad
4 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
roles/ynh_config/README-FR.md
View file

@ -15,7 +15,6 @@ Les variables par défaut sont disponibles dans `default/main.yml` cependant il
### Configuration d'un relais SMTP ### Configuration d'un relais SMTP
```yml ```yml
# paramètres personnalisés du relais SMTP
ynh_smtp_relay: ynh_smtp_relay:
host: smtp.domain.tld host: smtp.domain.tld
port: 25 port: 25
@ -24,7 +23,7 @@ ynh_smtp_relay:
``` ```
Yunohost possède son propre serveur SMTP natif mais il est aussi possible de configurer Yunohost pour qu'il utilise un relais SMTP à la place. Yunohost possède son propre serveur SMTP natif mais il est aussi possible de configurer Yunohost pour qu'il utilise un relais SMTP à la place.
Pour faire cela, créez la variable `ynh_smtp_relay` et mettez vos propres valeurs. Vous pouvez en apprendre plus sur les relais SMTP [ici](https://yunohost.org/fr/administrate/specific_use_cases/email_relay). Pour faire cela, créez la variable `ynh_smtp_relay` pour y mettre vos propres valeurs. Vous pouvez en apprendre plus sur les relais SMTP [ici](https://yunohost.org/fr/administrate/specific_use_cases/email_relay).
### Configuration des mises à jour ### Configuration des mises à jour

3
roles/ynh_config/README.md
View file

@ -15,7 +15,6 @@ Default variables are available in `default/main.yml` however it is necessary to
### SMTP relay configuration ### SMTP relay configuration
```yml ```yml
# SMTP custom settings
ynh_smtp_relay: ynh_smtp_relay:
host: smtp.domain.tld host: smtp.domain.tld
port: 25 port: 25
@ -24,7 +23,7 @@ ynh_smtp_relay:
``` ```
There is a built-in SMTP server on Yunohost but you can also set up Yunohost to use a SMTP relay instead. There is a built-in SMTP server on Yunohost but you can also set up Yunohost to use a SMTP relay instead.
In order to do so, create the `ynh_smtp_relay` variable and provide your own values. You can learn more about SMTP relay [here](https://yunohost.org/en/administrate/specific_use_cases/email_relay). In order to do so, create the `ynh_smtp_relay` variable in order to provide your own values. You can learn more about SMTP relay [here](https://yunohost.org/en/administrate/specific_use_cases/email_relay).
### Updates configuration ### Updates configuration

8
roles/ynh_config/tasks/main.yml
View file

@ -18,6 +18,14 @@
# # # #
#-----------------------------------------------------------------------------# #-----------------------------------------------------------------------------#
- name: Ensure SMTP relay is enabled
ansible.builtin.command:
"yunohost settings set email.smtp.smtp_relay_enabled -v yes"
when: ynh_smtp_relay
tags:
- yunohost
- smtp
- name: Configure SMTP relay - name: Configure SMTP relay
ansible.builtin.include_tasks: smtp_relay.yml ansible.builtin.include_tasks: smtp_relay.yml
loop: "{{ ynh_smtp_relay | dict2items }}" loop: "{{ ynh_smtp_relay | dict2items }}"

2
roles/ynh_config/tasks/smtp_relay.yml
View file

@ -22,7 +22,7 @@
ansible.builtin.command: ansible.builtin.command:
"yunohost settings get smtp.relay.{{ item.key }}" "yunohost settings get smtp.relay.{{ item.key }}"
register: _ynh_smtp_current_values register: _ynh_smtp_current_values
changed_when: False changed_when: false
tags: tags:
- yunohost - yunohost
- smtp - smtp