mirror of
https://github.com/spantaleev/matrix-docker-ansible-deploy.git
synced 2024-11-07 03:07:33 +01:00
Merge pull request #1570 from altsalt/install_openssl
only enable openssl if necessary, closes #1510
This commit is contained in:
commit
b33ea48803
23
roles/matrix-base/tasks/util/ensure_openssl_installed.yml
Normal file
23
roles/matrix-base/tasks/util/ensure_openssl_installed.yml
Normal file
@ -0,0 +1,23 @@
|
|||||||
|
|
||||||
|
# This is for both CentOS 7 and 8
|
||||||
|
- name: Ensure openssl installed (CentOS)
|
||||||
|
yum:
|
||||||
|
name:
|
||||||
|
- openssl
|
||||||
|
state: latest
|
||||||
|
when: ansible_distribution == 'CentOS'
|
||||||
|
|
||||||
|
# This is for both Debian and Raspbian
|
||||||
|
- name: Ensure openssl installed (Debian/Raspbian)
|
||||||
|
apt:
|
||||||
|
name:
|
||||||
|
- openssl
|
||||||
|
state: latest
|
||||||
|
when: ansible_os_family == 'Debian'
|
||||||
|
|
||||||
|
- name: Ensure openssl installed (Archlinux)
|
||||||
|
pacman:
|
||||||
|
name:
|
||||||
|
- openssl
|
||||||
|
state: latest
|
||||||
|
when: ansible_distribution == 'Archlinux'
|
@ -1,5 +1,7 @@
|
|||||||
---
|
---
|
||||||
|
|
||||||
|
- import_tasks: "{{ role_path }}/../matrix-base/tasks/util/ensure_openssl_installed.yml"
|
||||||
|
|
||||||
- name: Ensure Appservice IRC paths exist
|
- name: Ensure Appservice IRC paths exist
|
||||||
file:
|
file:
|
||||||
path: "{{ item.path }}"
|
path: "{{ item.path }}"
|
||||||
|
@ -1,5 +1,7 @@
|
|||||||
---
|
---
|
||||||
|
|
||||||
|
- import_tasks: "{{ role_path }}/../matrix-base/tasks/util/ensure_openssl_installed.yml"
|
||||||
|
|
||||||
#
|
#
|
||||||
# Tasks related to setting up jitsi
|
# Tasks related to setting up jitsi
|
||||||
#
|
#
|
||||||
|
@ -1,28 +1,7 @@
|
|||||||
---
|
---
|
||||||
|
|
||||||
- name: Ensure OpenSSL installed (RedHat)
|
- import_tasks: "{{ role_path }}/../matrix-base/tasks/util/ensure_openssl_installed.yml"
|
||||||
yum:
|
when: "matrix_ssl_retrieval_method == 'self-signed'"
|
||||||
name:
|
|
||||||
- openssl
|
|
||||||
state: present
|
|
||||||
update_cache: no
|
|
||||||
when: "matrix_ssl_retrieval_method == 'self-signed' and ansible_os_family == 'RedHat'"
|
|
||||||
|
|
||||||
- name: Ensure APT usage dependencies are installed (Debian)
|
|
||||||
apt:
|
|
||||||
name:
|
|
||||||
- openssl
|
|
||||||
state: present
|
|
||||||
update_cache: no
|
|
||||||
when: "matrix_ssl_retrieval_method == 'self-signed' and ansible_os_family == 'Debian'"
|
|
||||||
|
|
||||||
- name: Ensure OpenSSL installed (Archlinux)
|
|
||||||
pacman:
|
|
||||||
name:
|
|
||||||
- openssl
|
|
||||||
state: latest
|
|
||||||
update_cache: no
|
|
||||||
when: "matrix_ssl_retrieval_method == 'self-signed' and ansible_distribution == 'Archlinux'"
|
|
||||||
|
|
||||||
- name: Generate self-signed certificates
|
- name: Generate self-signed certificates
|
||||||
include_tasks: "{{ role_path }}/tasks/ssl/setup_ssl_self_signed_obtain_for_domain.yml"
|
include_tasks: "{{ role_path }}/tasks/ssl/setup_ssl_self_signed_obtain_for_domain.yml"
|
||||||
|
Loading…
Reference in New Issue
Block a user