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

add ntpd defaults

pull/437/head
Alin Trăistaru 5 лет назад
Родитель
Сommit
604e581a97
6 измененных файлов: 9 добавлений и 6 удалений
  1. +3
    -0
      roles/matrix-base/defaults/main.yml
  2. +2
    -2
      roles/matrix-base/tasks/server_base/setup.yml
  3. +1
    -1
      roles/matrix-base/tasks/server_base/setup_archlinux.yml
  4. +1
    -1
      roles/matrix-base/tasks/server_base/setup_centos.yml
  5. +1
    -1
      roles/matrix-base/tasks/server_base/setup_debian.yml
  6. +1
    -1
      roles/matrix-base/tasks/server_base/setup_raspbian.yml

+ 3
- 0
roles/matrix-base/defaults/main.yml Просмотреть файл

@@ -33,6 +33,9 @@ matrix_systemd_path: "/etc/systemd/system"
matrix_cron_path: "/etc/cron.d"
matrix_local_bin_path: "/usr/local/bin"

matrix_ntpd_package: "ntp"
matrix_ntpd_service: "{{ 'ntpd' if ansible_os_family == 'RedHat' or ansible_distribution == 'Archlinux' else 'ntp' }}"

matrix_homeserver_url: "https://{{ matrix_server_fqn_matrix }}"

matrix_identity_server_url: ~


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

@@ -18,8 +18,8 @@
state: started
enabled: yes

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

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

@@ -4,7 +4,7 @@
pacman:
name:
- python-docker
- ntp
- "{{ matrix_ntpd_package }}"
# TODO This needs to be verified. Which version do we need?
- fuse3
- python-dnspython


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

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


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

@@ -28,7 +28,7 @@
apt:
name:
- "python{{'3' if ansible_python.version.major == 3 else ''}}-docker"
- ntp
- "{{ matrix_ntpd_package }}"
- fuse
state: latest
update_cache: yes


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

@@ -28,7 +28,7 @@
apt:
name:
- python-docker
- ntp
- "{{ matrix_ntpd_package }}"
- fuse
state: latest
update_cache: yes


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