diff --git a/ansible/environments/laptop/host_vars/odolinux b/ansible/environments/laptop/host_vars/odolinux index 76ed30b..13a7128 100644 --- a/ansible/environments/laptop/host_vars/odolinux +++ b/ansible/environments/laptop/host_vars/odolinux @@ -16,7 +16,7 @@ users: - homeassistant gitconfig: "gitconfig_home" zfs_snapshot_datasets: - - zroot/linux/archmain/home + # - zroot/linux/archmain/home - zroot/linux/archmain/be install_graphics: true graphics_driver: "intel" diff --git a/ansible/roles/zrepl/tasks/common.yaml b/ansible/roles/zrepl/tasks/common.yaml index 801a529..c4f2d20 100644 --- a/ansible/roles/zrepl/tasks/common.yaml +++ b/ansible/roles/zrepl/tasks/common.yaml @@ -1,25 +1,5 @@ -- name: Create directories - file: - name: "{{ item }}" - state: directory - mode: 0755 - owner: root - group: wheel - loop: - - /usr/local/etc/zrepl - - import_tasks: tasks/freebsd.yaml when: 'os_flavor == "freebsd"' - import_tasks: tasks/linux.yaml when: 'os_flavor == "linux"' - -- name: Configure zrepl - template: - src: templates/zrepl.yml.j2 - dest: /usr/local/etc/zrepl/zrepl.yml - mode: 0440 - owner: root - group: wheel - validate: "zrepl configcheck --config %s" - notify: "restart zrepl" diff --git a/ansible/roles/zrepl/tasks/freebsd.yaml b/ansible/roles/zrepl/tasks/freebsd.yaml index d316930..ce8fd6c 100644 --- a/ansible/roles/zrepl/tasks/freebsd.yaml +++ b/ansible/roles/zrepl/tasks/freebsd.yaml @@ -4,6 +4,26 @@ - zrepl state: present +- name: Create directories + file: + name: "{{ item }}" + state: directory + mode: 0755 + owner: root + group: wheel + loop: + - /usr/local/etc/zrepl + +- name: Configure zrepl + template: + src: templates/zrepl.yml.j2 + dest: /usr/local/etc/zrepl/zrepl.yml + mode: 0440 + owner: root + group: wheel + validate: "zrepl configcheck --config %s" + notify: "restart zrepl" + - name: Enable services copy: src: "files/{{ item.src }}" diff --git a/ansible/roles/zrepl/tasks/linux.yaml b/ansible/roles/zrepl/tasks/linux.yaml index 93826b0..ee73e19 100644 --- a/ansible/roles/zrepl/tasks/linux.yaml +++ b/ansible/roles/zrepl/tasks/linux.yaml @@ -20,6 +20,26 @@ - zrepl state: present +- name: Create directories + file: + name: "{{ item }}" + state: directory + mode: 0755 + owner: root + group: wheel + loop: + - /etc/zrepl + +- name: Configure zrepl + template: + src: templates/zrepl.yml.j2 + dest: /etc/zrepl/zrepl.yml + mode: 0440 + owner: root + group: wheel + validate: "zrepl configcheck --config %s" + notify: "restart zrepl" + - name: Enable services systemd: enabled: yes