Slavi Pantaleev 3 лет назад
Родитель
Сommit
211ff20891
9 измененных файлов: 22 добавлений и 22 удалений
  1. +2
    -2
      roles/matrix-base/tasks/server_base/setup_archlinux.yml
  2. +2
    -2
      roles/matrix-base/tasks/server_base/setup_debian.yml
  3. +3
    -3
      roles/matrix-base/tasks/server_base/setup_fedora.yml
  4. +2
    -2
      roles/matrix-base/tasks/server_base/setup_raspbian.yml
  5. +2
    -2
      roles/matrix-base/tasks/server_base/setup_redhat.yml
  6. +4
    -4
      roles/matrix-base/tasks/server_base/setup_redhat8.yml
  7. +3
    -3
      roles/matrix-base/tasks/util/ensure_fuse_installed.yml
  8. +3
    -3
      roles/matrix-base/tasks/util/ensure_openssl_installed.yml
  9. +1
    -1
      roles/matrix-ma1sd/tasks/setup_install.yml

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

@@ -5,12 +5,12 @@
name:
- python-docker
- python-dnspython
state: latest
state: present
update_cache: true

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

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

@@ -29,7 +29,7 @@
ansible.builtin.apt:
name:
- "{{ matrix_ntpd_package }}"
state: latest
state: present
update_cache: true

- name: Ensure Docker is installed
@@ -37,5 +37,5 @@
name:
- "{{ matrix_docker_package_name }}"
- "python{{ '3' if ansible_python.version.major == 3 else '' }}-docker"
state: latest
state: present
when: matrix_docker_installation_enabled | bool

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

@@ -21,7 +21,7 @@
ansible.builtin.yum:
name:
- "{{ matrix_ntpd_package }}"
state: latest
state: present
update_cache: true

- name: Ensure Docker is installed
@@ -29,11 +29,11 @@
name:
- "{{ matrix_docker_package_name }}"
- python3-pip
state: latest
state: present
when: matrix_docker_installation_enabled | bool

- name: Ensure Docker-Py is installed
ansible.builtin.pip:
name: docker-py
state: latest
state: present
when: matrix_docker_installation_enabled | bool

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

@@ -29,7 +29,7 @@
ansible.builtin.apt:
name:
- "{{ matrix_ntpd_package }}"
state: latest
state: present
update_cache: true

- name: Ensure Docker is installed
@@ -37,5 +37,5 @@
name:
- "{{ matrix_docker_package_name }}"
- "python{{'3' if ansible_python.version.major == 3 else ''}}-docker"
state: latest
state: present
when: matrix_docker_installation_enabled | bool

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

@@ -19,7 +19,7 @@
ansible.builtin.yum:
name:
- "{{ matrix_ntpd_package }}"
state: latest
state: present
update_cache: true

- name: Ensure Docker is installed
@@ -27,5 +27,5 @@
name:
- "{{ matrix_docker_package_name }}"
- docker-python
state: latest
state: present
when: matrix_docker_installation_enabled | bool

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

@@ -19,14 +19,14 @@
ansible.builtin.yum:
name:
- epel-release
state: latest
state: present
update_cache: true

- name: Ensure yum packages are installed
ansible.builtin.yum:
name:
- "{{ matrix_ntpd_package }}"
state: latest
state: present
update_cache: true

- name: Ensure Docker is installed
@@ -34,11 +34,11 @@
name:
- "{{ matrix_docker_package_name }}"
- python3-pip
state: latest
state: present
when: matrix_docker_installation_enabled | bool

- name: Ensure Docker-Py is installed
ansible.builtin.pip:
name: docker-py
state: latest
state: present
when: matrix_docker_installation_enabled | bool

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

@@ -4,7 +4,7 @@
ansible.builtin.yum:
name:
- fuse
state: latest
state: present
when: ansible_os_family == 'RedHat'

# This is for both Debian and Raspbian
@@ -12,12 +12,12 @@
ansible.builtin.apt:
name:
- fuse
state: latest
state: present
when: ansible_os_family == 'Debian'

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

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

@@ -4,7 +4,7 @@
ansible.builtin.yum:
name:
- openssl
state: latest
state: present
when: ansible_os_family == 'RedHat'

# This is for both Debian and Raspbian
@@ -12,12 +12,12 @@
ansible.builtin.apt:
name:
- openssl
state: latest
state: present
when: ansible_os_family == 'Debian'

- name: Ensure openssl installed (Archlinux)
pacman:
name:
- openssl
state: latest
state: present
when: ansible_distribution == 'Archlinux'

+ 1
- 1
roles/matrix-ma1sd/tasks/setup_install.yml Просмотреть файл

@@ -75,7 +75,7 @@
pacman:
name:
- gradle
state: latest
state: present
update_cache: true
when: ansible_distribution == 'Archlinux'



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