Browse Source

Use discovered IPv4 address

Luke Cyca 10 years ago
parent
commit
b1a3b8b67d

+ 1
- 1
roles/common/templates/etc_fail2ban_jail.local.j2 View File

@@ -1,5 +1,5 @@
1 1
 [DEFAULT]
2
-ignoreip  = 127.0.0.1 {{ server_ip_address }}
2
+ignoreip  = 127.0.0.1 {{ ansible_default_ipv4.address }}
3 3
 bantime   = 86400
4 4
 destemail = {{ admin_email }}
5 5
 banaction = iptables-multiport

+ 1
- 1
roles/mailserver/tasks/checkrbl.yml View File

@@ -2,4 +2,4 @@
2 2
   get_url: url=https://raw.github.com/lukecyca/check-rbl/f6b222b0ca/check-rbl.pl dest=/opt/check-rbl.pl
3 3
 
4 4
 - name: Install nightly check-rbl cronjob
5
-  cron: name="check-rbl" hour="2" minute="0" job="perl /opt/check-rbl.pl -i ${server_ip_address}"
5
+  cron: name="check-rbl" hour="2" minute="0" job="perl /opt/check-rbl.pl -i {{ ansible_default_ipv4.address }}"

+ 1
- 1
roles/mailserver/templates/etc_opendkim_TrustedHosts.j2 View File

@@ -1,5 +1,5 @@
1 1
 127.0.0.1
2
-{{ server_ip_address }}
2
+{{ ansible_default_ipv4.address }}
3 3
 {% for domain in mail_virtual_domains %}
4 4
 {{ domain.name }}
5 5
 {% endfor %}

+ 0
- 1
vars/defaults.yml View File

@@ -9,7 +9,6 @@
9 9
 # main_user_name: (required)
10 10
 admin_email: "{{ main_user_name }}@{{ domain }}"
11 11
 # encfs_password: (required)
12
-# server_ip_address: (required)
13 12
 
14 13
 # ircbouncer
15 14
 znc_version: 1.0

+ 0
- 1
vars/user.yml View File

@@ -8,7 +8,6 @@
8 8
 domain: TODO.com
9 9
 main_user_name: TODO
10 10
 encfs_password: TODO
11
-server_ip_address: TODO
12 11
 
13 12
 # ircbouncer
14 13
 irc_nick: TODO

Loading…
Cancel
Save