diff options
| author | Matthieu Saulnier <fantom@fedoraproject.org> | 2018-12-20 19:42:03 +0100 |
|---|---|---|
| committer | Matthieu Saulnier <fantom@fedoraproject.org> | 2018-12-20 19:42:03 +0100 |
| commit | d62895c650ee14a7988b13cac0b11087c7cf7b9e (patch) | |
| tree | 570a52c30869a1d64074ef64052ee23ad78cb252 | |
| parent | 9bc3963fc2c999b4fd09cf66c62fb310d21be466 (diff) | |
| download | playbooks-ansible-d62895c650ee14a7988b13cac0b11087c7cf7b9e.tar.gz playbooks-ansible-d62895c650ee14a7988b13cac0b11087c7cf7b9e.tar.xz playbooks-ansible-d62895c650ee14a7988b13cac0b11087c7cf7b9e.zip | |
Add basedomain role variable and add user create task in mtaserver role
| -rw-r--r-- | roles/mtaserver/tasks/config.yml | 8 | ||||
| -rw-r--r-- | roles/mtaserver/templates/main.cf.j2 | 10 | ||||
| -rw-r--r-- | roles/mtaserver/vars/main.yml | 1 |
3 files changed, 14 insertions, 5 deletions
diff --git a/roles/mtaserver/tasks/config.yml b/roles/mtaserver/tasks/config.yml index e51131c..7ac1dc5 100644 --- a/roles/mtaserver/tasks/config.yml +++ b/roles/mtaserver/tasks/config.yml @@ -48,6 +48,7 @@ group: root mode: 0400 notify: credentialmap + when: mtadomain is not defined - name: Configuration alias root lineinfile: @@ -72,3 +73,10 @@ - name: Restauration des contextes SELinux des fichiers de conf command: /sbin/restorecon -R /etc/postfix/ /etc/aliases when: ansible_selinux.status != "disabled" + +- name: Création des utilisateurs système + user: + name: "{{ item }}" + state: present + with_items: + - "{{ userlist }}" diff --git a/roles/mtaserver/templates/main.cf.j2 b/roles/mtaserver/templates/main.cf.j2 index d0d5213..e257e19 100644 --- a/roles/mtaserver/templates/main.cf.j2 +++ b/roles/mtaserver/templates/main.cf.j2 @@ -98,9 +98,9 @@ myhostname = {{ mtahost }}.{{ mtadomain.0 }} {% elif mtadomain is defined %} myhostname = mail.{{ mtadomain.0 }} {% elif ansible_default_ipv4.network == localnet %} -myhostname = {{ ansible_hostname }}.home.casperlefantom.net +myhostname = {{ ansible_hostname }}.home.{{ basedomain }} {% else %} -myhostname = {{ ansible_hostname }}.casperlefantom.net +myhostname = {{ ansible_hostname }}.{{ basedomain }} {% endif %} # The mydomain parameter specifies the local internet domain name. @@ -112,9 +112,9 @@ myhostname = {{ ansible_hostname }}.casperlefantom.net {% if mtadomain is defined %} mydomain = {{ mtadomain.0 }} {% elif ansible_default_ipv4.network == localnet %} -mydomain = {{ ansible_hostname }}.home.casperlefantom.net +mydomain = {{ ansible_hostname }}.home.{{ basedomain }} {% else %} -mydomain = {{ ansible_hostname }}.casperlefantom.net +mydomain = {{ ansible_hostname }}.{{ basedomain }} {% endif %} # SENDING MAIL @@ -360,7 +360,7 @@ mynetworks = hash:/etc/postfix/network_table {% if mtadomain is defined %} ##relayhost = [smtp.free.fr] {% else %} -relayhost = [mail.casperlefantom.net]:587 +relayhost = [mail.{{ basedomain }}]:587 smtp_sasl_auth_enable = yes smtp_sasl_password_maps = hash:/etc/postfix/credentials smtp_sasl_security_options = noanonymous diff --git a/roles/mtaserver/vars/main.yml b/roles/mtaserver/vars/main.yml index b8c5058..496c224 100644 --- a/roles/mtaserver/vars/main.yml +++ b/roles/mtaserver/vars/main.yml @@ -1,5 +1,6 @@ localnet: 192.168.0.0 crtversion: 1 +basedomain: casperlefantom.net addresses: - 192.168.122.124 |