fix ansible 2.8 bool vars
continuous-integration/drone/push Build is passing Details

This commit is contained in:
Robert Kaussow 2019-06-10 14:06:34 +02:00
parent 38596fd4ee
commit 1a88c99653
4 changed files with 11 additions and 9 deletions

View File

@ -39,7 +39,7 @@
name: "matrix-synapse-ldap3"
virtualenv: "{{ matrix_base_dir }}/env"
virtualenv_command: /usr/bin/python3 -m venv
when: matrix_ldap_auth_enabled
when: matrix_ldap_auth_enabled | bool
- name: Create signing key
shell: "{{ matrix_base_dir }}/env/bin/python -c \"from signedjson import key; file = open('{{ matrix_conf_dir }}/{{ matrix_server_url }}.signing.key','w'); key.write_signing_keys(file, [key.generate_signing_key('first')]); file.close()\""
@ -73,7 +73,7 @@
loop: "{{ matrix_logrotate_config }}"
loop_control:
label: "{{ item.log }}"
when: matrix_logrotate_enabled
when: matrix_logrotate_enabled | bool
- name: Open ports in iptables
iptables_raw:
@ -85,6 +85,6 @@
loop: "{{ matrix_open_ports }}"
loop_control:
label: "{{ item.name }}"
when: matrix_iptables_enabled
when: matrix_iptables_enabled | bool
become: True
become_user: root

View File

@ -1,11 +1,11 @@
---
- include_tasks: prepare.yml
- import_tasks: storage.yml
when: matrix_lvm_enabled
when: matrix_lvm_enabled | bool
- include_tasks: install.yml
- import_tasks: tls.yml
when: matrix_tls_enabled
when: matrix_tls_enabled | bool
tags: tls_renewal
- import_tasks: nginx.yml
when: matrix_nginx_vhost_enabled
when: matrix_nginx_vhost_enabled | bool
- include_tasks: post_tasks.yml

View File

@ -12,7 +12,7 @@
label: "{{ item.dest }}"
notify: __nginx_reload
delegate_to: "{{ matrix_nginx_server }}"
when: matrix_nginx_tls_enabled
when: matrix_nginx_tls_enabled | bool
become: True
become_user: root
tags: tls_renewal
@ -42,7 +42,9 @@
name: allow_matrix_nginx_proxy
state: present
rules: '-A OUTPUT -m state --state NEW -p tcp -d {{ matrix_nginx_proxy_ip }} --dport {{ matrix_nginx_proxy_port }} -j ACCEPT'
when: matrix_nginx_iptables_enabled and (not matrix_nginx_server == inventory_hostname or not matrix_nginx_server == "localhost")
when:
- matrix_nginx_iptables_enabled | bool
- (not matrix_nginx_server == inventory_hostname or not matrix_nginx_server == "localhost")
delegate_to: "{{ matrix_nginx_server }}"
become: True
become_user: root

View File

@ -58,4 +58,4 @@
no_log: True
when: matrix_postgres_user is defined
delegate_to: "{{ matrix_postgres_server }}"
when: matrix_postgres_enabled
when: matrix_postgres_enabled | bool