diff options
| author | Matthieu Saulnier <fantom@fedoraproject.org> | 2017-08-21 11:21:35 +0200 |
|---|---|---|
| committer | Matthieu Saulnier <fantom@fedoraproject.org> | 2017-08-21 11:21:35 +0200 |
| commit | 7ff229eb296d4ab65ae08ea3d86c3e3dc23a5373 (patch) | |
| tree | 268933a252c107950917d5cf5ae1a0cb54ed45dd | |
| parent | 2f83c91cc72ee613ef31abf28fccab13d17f6a82 (diff) | |
| download | playbooks-ansible-7ff229eb296d4ab65ae08ea3d86c3e3dc23a5373.tar.gz playbooks-ansible-7ff229eb296d4ab65ae08ea3d86c3e3dc23a5373.tar.xz playbooks-ansible-7ff229eb296d4ab65ae08ea3d86c3e3dc23a5373.zip | |
add few pkgs and fix mail from header
| -rw-r--r-- | roles/clients/tasks/pkgs.yml | 1 | ||||
| -rw-r--r-- | roles/common/tasks/pkgs.yml | 1 | ||||
| -rw-r--r-- | roles/mtaserver/templates/main.cf.j2 | 8 |
3 files changed, 10 insertions, 0 deletions
diff --git a/roles/clients/tasks/pkgs.yml b/roles/clients/tasks/pkgs.yml index c723de1..770cdd2 100644 --- a/roles/clients/tasks/pkgs.yml +++ b/roles/clients/tasks/pkgs.yml @@ -170,6 +170,7 @@ - libexif-gtk3 - python3-pelican - pandoc + - p7zip - name: Installation des paquets codecs dnf: name={{ item }} state=present diff --git a/roles/common/tasks/pkgs.yml b/roles/common/tasks/pkgs.yml index 179a582..8911bf5 100644 --- a/roles/common/tasks/pkgs.yml +++ b/roles/common/tasks/pkgs.yml @@ -54,6 +54,7 @@ - cryptsetup - rsync - sudo + - util-linux-user when: ansible_distribution == "Fedora" and ansible_distribution_version|int >= 22 diff --git a/roles/mtaserver/templates/main.cf.j2 b/roles/mtaserver/templates/main.cf.j2 index fbea52d..4caa1b8 100644 --- a/roles/mtaserver/templates/main.cf.j2 +++ b/roles/mtaserver/templates/main.cf.j2 @@ -109,7 +109,15 @@ myhostname = {{ ansible_hostname }}.casperlefantom.net # parameters. # #mydomain = domain.tld +{% if is_mtamaster is defined %} mydomain = casperlefantom.net +{% else %} +{% if ansible_default_ipv4.network == "192.168.0.0" or ansible_default_ipv4.network == "10.42.0.0" %} +mydomain = {{ ansible_hostname }}.home.casperlefantom.net +{% else %} +mydomain = {{ ansible_hostname }}.casperlefantom.net +{% endif %} +{% endif %} # SENDING MAIL # |