diff options
| author | Matthieu Saulnier <fantom@fedoraproject.org> | 2018-12-31 23:57:20 +0100 |
|---|---|---|
| committer | Matthieu Saulnier <fantom@fedoraproject.org> | 2018-12-31 23:57:20 +0100 |
| commit | cbd920d59dec7595ab16779c553ecee86cdbc7fc (patch) | |
| tree | 95d5519e97390a0e3291a3b413e62166f8e5ae67 | |
| parent | 1f3ea7f2855fef705df49a060c2bb5bd706a6c6d (diff) | |
| download | playbooks-ansible-cbd920d59dec7595ab16779c553ecee86cdbc7fc.tar.gz playbooks-ansible-cbd920d59dec7595ab16779c553ecee86cdbc7fc.tar.xz playbooks-ansible-cbd920d59dec7595ab16779c553ecee86cdbc7fc.zip | |
Minor fixes in lineinfile module. This is the last commit of the year
| -rw-r--r-- | roles/dnsserver/files/casperlefantom.net.zone | 5 | ||||
| -rw-r--r-- | roles/dnsserver/files/jaysfoodventure.com.zone | 5 | ||||
| -rw-r--r-- | roles/mtaserver/tasks/config.yml | 10 |
3 files changed, 6 insertions, 14 deletions
diff --git a/roles/dnsserver/files/casperlefantom.net.zone b/roles/dnsserver/files/casperlefantom.net.zone index 5ef3736..572680c 100644 --- a/roles/dnsserver/files/casperlefantom.net.zone +++ b/roles/dnsserver/files/casperlefantom.net.zone @@ -1,7 +1,7 @@ $ttl 86400 casperlefantom.net. IN SOA nsa.casperlefantom.net. hostmaster.casperlefantom.net. ( -2018123002 ; serial number -10800 ; refresh +2018123100 ; serial number +86400 ; refresh 3600 ; retry 1209600 ; expire 38400 ) ; min TTL @@ -23,7 +23,6 @@ admin IN NS nsc.admin.casperlefantom.net. admin IN NS nsd.admin.casperlefantom.net. admin IN NS nse.admin.casperlefantom.net. -@ IN MX 10 mail.casperlefantom.net. @ IN MX 30 mx1.casperlefantom.net. @ IN MX 40 mx2.casperlefantom.net. @ IN A 51.15.179.153 diff --git a/roles/dnsserver/files/jaysfoodventure.com.zone b/roles/dnsserver/files/jaysfoodventure.com.zone index 9eadd22..a1f8649 100644 --- a/roles/dnsserver/files/jaysfoodventure.com.zone +++ b/roles/dnsserver/files/jaysfoodventure.com.zone @@ -1,7 +1,7 @@ $ttl 86400 jaysfoodventure.com. IN SOA nsa.jaysfoodventure.com. hostmaster.jaysfoodventure.com. ( -2018122900 ; serial number -10800 ; refresh +2018123100 ; serial number +86400 ; refresh 3600 ; retry 1209600 ; expire 38400 ) ; min TTL @@ -10,7 +10,6 @@ jaysfoodventure.com. IN SOA nsa.jaysfoodventure.com. hostmaster.jaysfoodventure. @ IN NS nsb.jaysfoodventure.com. @ IN NS nsd.jaysfoodventure.com. -@ IN MX 10 mail.casperlefantom.net. @ IN MX 30 mx1.casperlefantom.net. @ IN MX 40 mx2.casperlefantom.net. @ IN A 51.15.179.153 diff --git a/roles/mtaserver/tasks/config.yml b/roles/mtaserver/tasks/config.yml index a322d88..6930dd8 100644 --- a/roles/mtaserver/tasks/config.yml +++ b/roles/mtaserver/tasks/config.yml @@ -53,7 +53,7 @@ - name: Configuration alias root lineinfile: path: /etc/aliases - line: 'root: casper@casperlefantom.net' + line: "root: {{ userlist.0 }}@{{ basedomain }}" notify: aliasmap - name: Configuration alias matthieu @@ -66,7 +66,7 @@ - name: Configuration alias casper lineinfile: path: /etc/aliases - line: 'casper: casper@casperlefantom.net' + line: "casper: {{ userlist.0 }}@{{ basedomain }}" notify: aliasmap when: mtadomain is not defined @@ -148,8 +148,6 @@ - name: Activation du protocole imap dans dovecot lineinfile: path: /etc/dovecot/dovecot.conf - state: present - backrefs: yes insertafter: "#protocols = imap pop3 lmtp" line: "protocols = imap" when: mtadomain is defined @@ -168,8 +166,6 @@ - name: Configuration des boites mail imap lineinfile: path: /etc/dovecot/conf.d/10-mail.conf - state: present - backrefs: yes insertafter: "#mail_location = " line: "mail_location = mbox:~/Mail:INBOX=/var/mail/%u" when: mtadomain is defined @@ -178,8 +174,6 @@ - name: Configuration du groupe utilisateurs imap lineinfile: path: /etc/dovecot/conf.d/10-mail.conf - state: present - backrefs: yes insertafter: "#mail_access_groups =" line: "mail_access_groups = mail" when: mtadomain is defined |