Do not force firewalld on people
In most cases, there's not really a need to touch the system firewall, as Docker manages iptables by itself (see https://docs.docker.com/network/iptables/). All ports exposed by Docker containers are automatically whitelisted in iptables and wired to the correct container. This made installing firewalld and whitelisting ports pointless, as far as this playbook's services are concerned. People that wish to install firewalld (for other reasons), can do so manually from now on. This is inspired by and fixes #97 (Github Issue).
This commit is contained in:
parent
0b034ac34b
commit
af1c9ae59d
@ -23,7 +23,6 @@
|
|||||||
- bash-completion
|
- bash-completion
|
||||||
- docker-ce
|
- docker-ce
|
||||||
- docker-python
|
- docker-python
|
||||||
- firewalld
|
|
||||||
- ntp
|
- ntp
|
||||||
- fuse
|
- fuse
|
||||||
state: latest
|
state: latest
|
||||||
@ -67,13 +66,6 @@
|
|||||||
update_cache: yes
|
update_cache: yes
|
||||||
when: ansible_os_family == 'Debian'
|
when: ansible_os_family == 'Debian'
|
||||||
|
|
||||||
- name: Ensure firewalld is started and autoruns
|
|
||||||
service:
|
|
||||||
name: firewalld
|
|
||||||
state: started
|
|
||||||
enabled: yes
|
|
||||||
when: ansible_os_family == 'RedHat'
|
|
||||||
|
|
||||||
- name: Ensure Docker is started and autoruns
|
- name: Ensure Docker is started and autoruns
|
||||||
service:
|
service:
|
||||||
name: docker
|
name: docker
|
||||||
|
@ -54,20 +54,6 @@
|
|||||||
daemon_reload: yes
|
daemon_reload: yes
|
||||||
when: "matrix_coturn_enabled and matrix_coturn_systemd_service_result.changed"
|
when: "matrix_coturn_enabled and matrix_coturn_systemd_service_result.changed"
|
||||||
|
|
||||||
- name: Allow access to Coturn ports in firewalld
|
|
||||||
firewalld:
|
|
||||||
port: "{{ item }}"
|
|
||||||
state: enabled
|
|
||||||
immediate: yes
|
|
||||||
permanent: yes
|
|
||||||
with_items:
|
|
||||||
- '3478/tcp'
|
|
||||||
- '3478/udp'
|
|
||||||
- '5349/tcp'
|
|
||||||
- '5349/udp'
|
|
||||||
- "{{ matrix_coturn_turn_udp_min_port }}-{{ matrix_coturn_turn_udp_max_port }}/udp" # TURN
|
|
||||||
when: "matrix_coturn_enabled and ansible_os_family == 'RedHat'"
|
|
||||||
|
|
||||||
# This may be unnecessary when more long-lived certificates are used.
|
# This may be unnecessary when more long-lived certificates are used.
|
||||||
# We optimize for the common use-case though (short-lived Let's Encrypt certificates).
|
# We optimize for the common use-case though (short-lived Let's Encrypt certificates).
|
||||||
# Reloading doesn't hurt anyway, so there's no need to make this more flexible.
|
# Reloading doesn't hurt anyway, so there's no need to make this more flexible.
|
||||||
|
@ -99,17 +99,6 @@
|
|||||||
name: "{{ matrix_nginx_proxy_docker_image }}"
|
name: "{{ matrix_nginx_proxy_docker_image }}"
|
||||||
when: matrix_nginx_proxy_enabled
|
when: matrix_nginx_proxy_enabled
|
||||||
|
|
||||||
- name: Allow access to nginx proxy ports in firewalld
|
|
||||||
firewalld:
|
|
||||||
service: "{{ item }}"
|
|
||||||
state: enabled
|
|
||||||
immediate: yes
|
|
||||||
permanent: yes
|
|
||||||
with_items:
|
|
||||||
- "http"
|
|
||||||
- "https"
|
|
||||||
when: "matrix_nginx_proxy_enabled and ansible_os_family == 'RedHat'"
|
|
||||||
|
|
||||||
- name: Ensure matrix-nginx-proxy.service installed
|
- name: Ensure matrix-nginx-proxy.service installed
|
||||||
template:
|
template:
|
||||||
src: "{{ role_path }}/templates/systemd/matrix-nginx-proxy.service.j2"
|
src: "{{ role_path }}/templates/systemd/matrix-nginx-proxy.service.j2"
|
||||||
|
@ -33,17 +33,6 @@
|
|||||||
- "{{ matrix_ssl_lets_encrypt_support_email }}"
|
- "{{ matrix_ssl_lets_encrypt_support_email }}"
|
||||||
when: "matrix_ssl_retrieval_method == 'lets-encrypt' and item is none"
|
when: "matrix_ssl_retrieval_method == 'lets-encrypt' and item is none"
|
||||||
|
|
||||||
- name: Allow access to HTTP/HTTPS in firewalld
|
|
||||||
firewalld:
|
|
||||||
service: "{{ item }}"
|
|
||||||
state: enabled
|
|
||||||
immediate: yes
|
|
||||||
permanent: yes
|
|
||||||
with_items:
|
|
||||||
- http
|
|
||||||
- https
|
|
||||||
when: "matrix_ssl_retrieval_method == 'lets-encrypt' and ansible_os_family == 'RedHat'"
|
|
||||||
|
|
||||||
- name: Ensure certbot Docker image is pulled
|
- name: Ensure certbot Docker image is pulled
|
||||||
docker_image:
|
docker_image:
|
||||||
name: "{{ matrix_ssl_lets_encrypt_certbot_docker_image }}"
|
name: "{{ matrix_ssl_lets_encrypt_certbot_docker_image }}"
|
||||||
|
@ -77,12 +77,3 @@
|
|||||||
dest: "/usr/local/bin/matrix-synapse-register-user"
|
dest: "/usr/local/bin/matrix-synapse-register-user"
|
||||||
mode: 0750
|
mode: 0750
|
||||||
|
|
||||||
- name: Allow access to Matrix ports in firewalld
|
|
||||||
firewalld:
|
|
||||||
port: "{{ item }}"
|
|
||||||
state: enabled
|
|
||||||
immediate: yes
|
|
||||||
permanent: yes
|
|
||||||
with_items:
|
|
||||||
- '8448/tcp' # Matrix federation
|
|
||||||
when: ansible_os_family == 'RedHat'
|
|
||||||
|
Loading…
Reference in New Issue
Block a user