Slavi Pantaleev 4 лет назад
Родитель
Сommit
4e4fb98a65
7 измененных файлов: 26 добавлений и 7 удалений
  1. +0
    -2
      roles/matrix-base/tasks/server_base/setup_archlinux.yml
  2. +0
    -1
      roles/matrix-base/tasks/server_base/setup_centos.yml
  3. +1
    -2
      roles/matrix-base/tasks/server_base/setup_centos8.yml
  4. +0
    -1
      roles/matrix-base/tasks/server_base/setup_debian.yml
  5. +0
    -1
      roles/matrix-base/tasks/server_base/setup_raspbian.yml
  6. +23
    -0
      roles/matrix-base/tasks/util/ensure_fuse_installed.yml
  7. +2
    -0
      roles/matrix-synapse/tasks/goofys/setup_install.yml

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

@@ -4,8 +4,6 @@
pacman:
name:
- python-docker
# TODO This needs to be verified. Which version do we need?
- fuse3
- python-dnspython
state: latest
update_cache: yes


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

@@ -21,7 +21,6 @@
yum:
name:
- "{{ matrix_ntpd_package }}"
- fuse
state: latest
update_cache: yes



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

@@ -28,7 +28,6 @@
yum:
name:
- "{{ matrix_ntpd_package }}"
- fuse
state: latest
update_cache: yes

@@ -44,4 +43,4 @@
pip:
name: docker-py
state: latest
when: matrix_docker_installation_enabled|bool
when: matrix_docker_installation_enabled|bool

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

@@ -29,7 +29,6 @@
apt:
name:
- "{{ matrix_ntpd_package }}"
- fuse
state: latest
update_cache: yes



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

@@ -29,7 +29,6 @@
apt:
name:
- "{{ matrix_ntpd_package }}"
- fuse
state: latest
update_cache: yes



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

@@ -0,0 +1,23 @@

# This is for both CentOS 7 and 8
- name: Ensure fuse installed (CentOS)
yum:
name:
- fuse
state: latest
when: ansible_distribution == 'CentOS'

# This is for both Debian and Raspbian
- name: Ensure fuse installed (Debian/Raspbian)
apt:
name:
- fuse
state: latest
when: ansible_os_family == 'Debian'

- name: Ensure fuse installed (Archlinux)
pacman:
name:
- fuse3
state: latest
when: ansible_distribution == 'Archlinux'

+ 2
- 0
roles/matrix-synapse/tasks/goofys/setup_install.yml Просмотреть файл

@@ -1,3 +1,5 @@
- import_tasks: "{{ role_path }}/../matrix-base/tasks/util/ensure_fuse_installed.yml"

- name: Ensure Goofys Docker image is pulled
docker_image:
name: "{{ matrix_s3_goofys_docker_image }}"


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