diff --git a/roles/common/tasks/guest.yml b/roles/common/tasks/guest.yml index db60a1f..04b0c04 100644 --- a/roles/common/tasks/guest.yml +++ b/roles/common/tasks/guest.yml @@ -4,14 +4,11 @@ stat: path=/dev/virtio-ports/org.qemu.guest_agent.0 register: qemu_ga_dev -- include_tasks: guest_{{ ansible_os_family }}.yml - when: - - qemu_ga_dev.stat.exists - - ansible_virtualization_type == 'kvm' - tags: always +- block: + - include_tasks: guest_{{ ansible_os_family }}.yml -- name: Start and enable qemu guest agent - service: name=qemu-guest-agent state=started enabled=True + - name: Start and enable qemu guest agent + service: name=qemu-guest-agent state=started enabled=True when: - - qemu_ga_dev.stat.exists + - qemu_ga_dev.stat.exists | default(False) - ansible_virtualization_type == 'kvm' diff --git a/roles/freepbx/tasks/install.yml b/roles/freepbx/tasks/install.yml index 2bb124f..073efd6 100644 --- a/roles/freepbx/tasks/install.yml +++ b/roles/freepbx/tasks/install.yml @@ -17,7 +17,7 @@ name: phone home: "{{ fpbx_root_dir }}/provisioning" shell: /bin/rbash - password: "{{ fpbx_phone_pass | password_hash('sha256', 65535 | random(seed=inventory_hostname)) }}" + password: "{{ fpbx_phone_pass | password_hash('sha256', 65535 | random(seed=inventory_hostname) | string) }}" tags: fpbx - when: fpbx_install_mode != 'none' @@ -138,3 +138,8 @@ - name: Install dehydrated hook template: src=dehydrated_hook.j2 dest=/etc/dehydrated/hooks_deploy_cert.d/freepbx.sh mode=755 tags: fpbx + +# PM2 requires the php command available in PATH +- name: Add a link to php + file: src=/bin/php{{ fpbx_php_version }} dest=/var/lib/asterisk/.node/bin/php state=link + tags: fpbx diff --git a/roles/matrix_synapse/defaults/main.yml b/roles/matrix_synapse/defaults/main.yml index 7c2d080..782fa06 100644 --- a/roles/matrix_synapse/defaults/main.yml +++ b/roles/matrix_synapse/defaults/main.yml @@ -1,7 +1,7 @@ --- # Synapse version to deploy -synapse_version: 1.53.0 +synapse_version: 1.54.0 # Should ansible handle Synapse upgrades ? If false, only initial install will be done synapse_manage_upgrade: True diff --git a/roles/miniflux/defaults/main.yml b/roles/miniflux/defaults/main.yml index 6e3425b..3e3de70 100644 --- a/roles/miniflux/defaults/main.yml +++ b/roles/miniflux/defaults/main.yml @@ -1,11 +1,11 @@ --- # Version to install -miniflux_version: 2.0.35 +miniflux_version: 2.0.36 # URL of the binary to install miniflux_bin_url: https://github.com/miniflux/v2/releases/download/{{ miniflux_version }}/miniflux-linux-amd64 -# Expected sha1 of the binary -miniflux_bin_sha1: b4558abc1252a71e862494a1461104aff9cfcfb8 +# Expected sha256 of the binary +miniflux_bin_sha256: 77e5a0e219a0cc2a7f856165757944681a9ebb39474e24cb8d0ad0c2c1502742 # Should ansible handle upgrades ? If false, only initial install will be done miniflux_manage_upgrade: True diff --git a/roles/miniflux/tasks/install.yml b/roles/miniflux/tasks/install.yml index f3ffb41..442b071 100644 --- a/roles/miniflux/tasks/install.yml +++ b/roles/miniflux/tasks/install.yml @@ -12,7 +12,7 @@ get_url: url: "{{ miniflux_bin_url }}" dest: "{{ miniflux_root_dir }}/bin/miniflux" - checksum: sha1:{{ miniflux_bin_sha1 }} + checksum: sha256:{{ miniflux_bin_sha256 }} mode: 755 when: miniflux_install_mode != 'none' notify: restart miniflux