diff --git a/roles/kanboard/defaults/main.yml b/roles/kanboard/defaults/main.yml index 9cc2eab..036209e 100644 --- a/roles/kanboard/defaults/main.yml +++ b/roles/kanboard/defaults/main.yml @@ -2,9 +2,9 @@ kanboard_id: "1" kanboard_manage_upgrade: True -kanboard_version: '1.2.19' +kanboard_version: '1.2.20' kanboard_zip_url: https://github.com/kanboard/kanboard/archive/v{{ kanboard_version }}.zip -kanboard_zip_sha1: d93547fde92141583d308e50ef29cc7a3bf90f1c +kanboard_zip_sha1: 114d6c5a368c6c1b58c8b98bdfcbf04df8fae67a # enabled prop for the ReverseProxyLdap plugin is managed automatically # True if kanboard_ldap_auth and kanboard_proxy_auth are both True, or # False otherwise diff --git a/roles/zfs/handlers/main.yml b/roles/zfs/handlers/main.yml index 5a04bfe..3580d28 100644 --- a/roles/zfs/handlers/main.yml +++ b/roles/zfs/handlers/main.yml @@ -3,3 +3,6 @@ - name: restart syncoid systemd: name=syncoid-{{ item.id }}.timer state=restarted loop: "{{ zfs_repl }}" + +- name: restart sanoid + systemd: name=sanoid.timer state=restarted diff --git a/roles/zfs/meta/main.yml b/roles/zfs/meta/main.yml index 5e9c797..cd9ada6 100644 --- a/roles/zfs/meta/main.yml +++ b/roles/zfs/meta/main.yml @@ -1,4 +1,5 @@ --- dependencies: - role: repo_zfs + when: ansible_os_family == 'RedHat' - role: zfs_common diff --git a/roles/zfs/tasks/install_Debian.yml b/roles/zfs/tasks/install_Debian.yml new file mode 100644 index 0000000..dd24b88 --- /dev/null +++ b/roles/zfs/tasks/install_Debian.yml @@ -0,0 +1,30 @@ +--- + +- name: Install dependencies + apt: + name: + - libcapture-tiny-perl + - libconfig-inifiles-perl + - pv + - lzop + - mbuffer + tags: zfs + +- name: Install sanoid + apt: deb=http://ftp.fr.debian.org/debian/pool/main/s/sanoid/sanoid_2.0.3-4_all.deb + tags: zfs + +- name: Setup sanoid service and timer + template: src=sanoid.{{ item }}.j2 dest=/etc/systemd/system/sanoid.{{ item }} + loop: + - service + - timer + register: zfs_sanoid_units + notify: restart sanoid + tags: zfs + +- name: Reload systemd + systemd: daemon_reload=True + when: zfs_sanoid_units.results | selectattr('changed','equalto',True) | list | length > 0 + tags: zfs + diff --git a/roles/zfs/tasks/install_RedHat.yml b/roles/zfs/tasks/install_RedHat.yml new file mode 100644 index 0000000..d57b7c4 --- /dev/null +++ b/roles/zfs/tasks/install_RedHat.yml @@ -0,0 +1,10 @@ +--- + +- name: Install packages + yum: + name: + - zfs + - sanoid + when: ansible_os_family == 'RedHat' + tags: zfs + diff --git a/roles/zfs/tasks/main.yml b/roles/zfs/tasks/main.yml index 8004fb7..a995e68 100644 --- a/roles/zfs/tasks/main.yml +++ b/roles/zfs/tasks/main.yml @@ -1,16 +1,15 @@ --- -- name: Install packages - yum: - name: - - zfs - - sanoid - tags: zfs +- include: install_{{ ansible_os_family }}.yml - name: load ZFS modprobe: name=zfs tags: zfs +- name: Create sanoid conf dir + file: path=/etc/sanoid/ state=directory + tags: zfs + - name: Deploy sanoid configuration template: src=sanoid.conf.j2 dest=/etc/sanoid/sanoid.conf tags: zfs @@ -139,6 +138,6 @@ - name: Install bash completion support get_url: - url: https://raw.githubusercontent.com/zfsonlinux/zfs/master/contrib/bash_completion.d/zfs + url: https://raw.githubusercontent.com/openzfs/zfs/master/contrib/bash_completion.d/zfs.in dest: /etc/bash_completion.d/zfs tags: zfs