Browse Source

We can use domain name instead of ip, see issue #17

Resolves #17
python3
Andrea Cimbalo 7 years ago
parent
commit
168b923661
5 changed files with 6 additions and 13 deletions
  1. +3
    -3
      mail.yaml
  2. +0
    -7
      roles/roundcube/tasks/main.yaml
  3. +1
    -1
      roles/sympa/meta/main.yaml
  4. +1
    -1
      users.yaml
  5. +1
    -1
      webmail.yaml

+ 3
- 3
mail.yaml View File

@ -10,13 +10,13 @@
roles:
- role: dns_record
- role: postfix
ldap_server: "{{ hostvars['ldap'].ansible_host }}"
ldap_server: "ldap.dmz.lilik"
fqdn_domain: "mail.lilik.it"
lists_server: "{{ hostvars['lists'].ansible_host }}"
lists_server: "list.dmz.lilik"
- role: dovecot
domain: "lilik.it"
fqdn_domain: "mail.lilik.it"
ldap_server: "{{ hostvars['ldap'].ansible_host }}"
ldap_server: "ldap.dmz.lilik"
- hosts: status
roles:
- role: icinga2-monitoring

+ 0
- 7
roles/roundcube/tasks/main.yaml View File

@ -34,13 +34,6 @@
mode: 0444
notify: update-ca-certificates
#TODO: remove when dovecot will use a valid dns record
- name: '(FIX REMOVE THIS ACTION) add temporary host record'
lineinfile:
dest: /etc/hosts
line: "{{ hostvars | ip_from_inventory('mail') }} {{ mail_server }}"
regexp: "{{ mail_server }}$"
- name: include my-roundcube.php
lineinfile:
dest: /etc/roundcube/config.inc.php


+ 1
- 1
roles/sympa/meta/main.yaml View File

@ -5,5 +5,5 @@ dependencies:
server_fqdn: "lists.lilik.it"
parent_role_path: "sympa"
- role: exim4
stmp_relay: "{{ hostvars | ip_from_inventory('mail') }}"
stmp_relay: "mail.dmz.lilik"
sympa_transport: true

+ 1
- 1
users.yaml View File

@ -11,7 +11,7 @@
- role: dns_record
- role: fail2ban
- role: pam-ldap
ldap_server: "{{ hostvars['ldap'].ansible_host }}"
ldap_server: "ldap.dmz.lilik"
- role: apache2
user_dir: true
- hosts: status


+ 1
- 1
webmail.yaml View File

@ -10,7 +10,7 @@
roles:
- role: dns_record
- role: roundcube
mail_server: "mail.lilik.it"
mail_server: "mail.dmz.lilik"
- hosts: status
roles:
- role: icinga2-monitoring

Loading…
Cancel
Save