Ubuntu 18.04 support #70

Closed
Ghost wants to merge 38 commits from ubuntu into unstable
3 changed files with 22 additions and 12 deletions
Showing only changes of commit ff9e1e80aa - Show all commits

View file

@ -29,7 +29,18 @@ minifirewall_private_ports_udp: []
# Keep a null value to leave the setting as is
# otherwise use an Array, eg. "minifirewall_ssh_ok: ['0.0.0.0/0']"
minifirewall_dns_servers: Null
minifirewall_http_sites: Null
minifirewall_http_sites:
- pub.evolix.net
- mirror.evolix.org
- hwraid.le-vert.net
- antispam00.evolix.org
- spamassassin.apache.org
- sa-update.space-pro.be
- sa-update.secnap.net
- www.sa-update.pccc.com
- sa-update.dnswl.org
minifirewall_https_sites: Null
minifirewall_ftp_sites: Null
minifirewall_ssh_ok: Null

View file

@ -50,7 +50,7 @@ DNSSERVEURS='0.0.0.0/0'
# HTTP authorizations
# (you can use DNS names but set cron to reload minifirewall regularly)
# (if you have HTTP proxy, set 0.0.0.0/0)
HTTPSITES='pub.evolix.net mirror.evolix.org hwraid.le-vert.net antispam00.evolix.org spamassassin.apache.org sa-update.space-pro.be sa-update.secnap.net www.sa-update.pccc.com sa-update.dnswl.org'
HTTPSITES=''
# HTTPS authorizations
HTTPSSITES='0.0.0.0/0'

View file

@ -114,10 +114,17 @@
create: no
when: minifirewall_dns_servers is not none
- name: Configure HTTPSITES
lineinfile:
dest: "{{ minifirewall_main_file }}"
line: "HTTPSITES='{{ minifirewall_http_sites | join(' ') }}'"
regexp: "HTTPSITES='.*'"
create: no
- name: Configure HTTPSITES for debian
lineinfile:
dest: "{{ minifirewall_main_file }}"
line: "HTTPSITES='{{ minifirewall_default_debian_http_sites | join(' ') }}'"
line: "HTTPSITES='{{ minifirewall_default_debian_http_sites | join(' ') }}' '{{ minifirewall_http_sites | join(' ') }}'"
regexp: "HTTPSITES='.*'"
create: no
when: ansible_distribution == "Debian"
@ -125,19 +132,11 @@
- name: Configure HTTPSITES for ubuntu
lineinfile:
dest: "{{ minifirewall_main_file }}"
line: "HTTPSITES='{{ minifirewall_default_ubuntu_http_sites | join(' ') }}'"
line: "HTTPSITES='{{ minifirewall_default_ubuntu_http_sites | join(' ') }}' '{{ minifirewall_http_sites | join(' ') }}'"
regexp: "HTTPSITES='.*'"
create: no
when: ansible_distribution == "Ubuntu"
- name: Configure HTTPSITES
lineinfile:
dest: "{{ minifirewall_main_file }}"
line: "HTTPSITES='{{ minifirewall_http_sites | join(' ') }}'"
regexp: "HTTPSITES='.*'"
create: no
when: minifirewall_http_sites is not none
- name: Configure HTTPSSITES
lineinfile:
dest: "{{ minifirewall_main_file }}"