Просмотр исходного кода

Added basic changes to make it compatible with Archlinux

pull/425/head
Christian Wolf 6 лет назад
Родитель
Сommit
d84b2868b7
6 измененных файлов: 56 добавлений и 1 удалений
  1. +7
    -0
      roles/matrix-base/tasks/sanity_check.yml
  2. +4
    -1
      roles/matrix-base/tasks/server_base/setup.yml
  3. +21
    -0
      roles/matrix-base/tasks/server_base/setup_archlinux.yml
  4. +8
    -0
      roles/matrix-mxisd/tasks/setup_mxisd.yml
  5. +8
    -0
      roles/matrix-nginx-proxy/tasks/ssl/setup_ssl_self_signed.yml
  6. +8
    -0
      roles/matrix-synapse/tasks/ext/synapse-simple-antispam/setup_install.yml

+ 7
- 0
roles/matrix-base/tasks/sanity_check.yml Просмотреть файл

@@ -44,3 +44,10 @@
- "{{ matrix_server_fqn_matrix }}"
- "{{ matrix_server_fqn_riot }}"
when: "item != item|lower"

- name: Fail if using python2 on Archlinux
fail:
msg: "Detected that you're using python2 when installing onto Archlinux. Archlinux by default only supports python3."
when:
- ansible_distribution == 'Archlinux'
- ansible_python.version.major != 3

+ 4
- 1
roles/matrix-base/tasks/server_base/setup.yml Просмотреть файл

@@ -9,6 +9,9 @@
- include_tasks: "{{ role_path }}/tasks/server_base/setup_raspbian.yml"
when: (ansible_os_family == 'Debian') and (ansible_lsb.id == 'Raspbian')

- include_tasks: "{{ role_path }}/tasks/server_base/setup_archlinux.yml"
when: ansible_distribution == 'Archlinux'

- name: Ensure Docker is started and autoruns
service:
name: docker
@@ -17,6 +20,6 @@

- name: Ensure ntpd is started and autoruns
service:
name: "{{ 'ntpd' if ansible_os_family == 'RedHat' else 'ntp' }}"
name: "{{ 'ntpd' if ansible_os_family == 'RedHat' or ansible_distribution == 'Archlinux' else 'ntp' }}"
state: started
enabled: yes

+ 21
- 0
roles/matrix-base/tasks/server_base/setup_archlinux.yml Просмотреть файл

@@ -0,0 +1,21 @@
---

- name: Install host dependencies
pacman:
name:
- bash-completion
- python-docker
- ntp
# TODO This needs to be verified. Which version do we need?
- fuse3
- cronie
- python-dnspython
state: latest
update_cache: yes

- name: Ensure Docker is installed
apt:
name:
- docker
state: latest
when: matrix_docker_installation_enabled|bool

+ 8
- 0
roles/matrix-mxisd/tasks/setup_mxisd.yml Просмотреть файл

@@ -39,6 +39,14 @@
msg: "Installing gradle on CentOS is currently not supported, so self-building mxisd cannot happen at this time"
when: ansible_distribution == 'CentOS'

- name: Ensure gradle is installed for self-building (Archlinux)
pacman:
name:
- gradle
state: latest
update_cache: yes
when: ansible_distribution == 'Archlinux'

- name: Ensure mxisd repository is present on self-build
git:
repo: https://github.com/kamax-matrix/mxisd.git


+ 8
- 0
roles/matrix-nginx-proxy/tasks/ssl/setup_ssl_self_signed.yml Просмотреть файл

@@ -16,6 +16,14 @@
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
include_tasks: "{{ role_path }}/tasks/ssl/setup_ssl_self_signed_obtain_for_domain.yml"
with_items: "{{ matrix_ssl_domains_to_obtain_certificates_for }}"


+ 8
- 0
roles/matrix-synapse/tasks/ext/synapse-simple-antispam/setup_install.yml Просмотреть файл

@@ -21,6 +21,14 @@
update_cache: no
when: "ansible_os_family == 'Debian'"

- name: Ensure git installed (Archlinux)
pacman
name:
- git
state: present
update_cache: no
when: "ansible_distribution == 'Archlinux'"

- name: Clone synapse-simple-antispam git repository
git:
repo: "{{ matrix_synapse_ext_spam_checker_synapse_simple_antispam_git_repository_url }}"


Загрузка…
Отмена
Сохранить