diff --git a/roles/mgrote.zfs_sanoid/defaults/main.yml b/roles/mgrote.zfs_sanoid/defaults/main.yml index 45e4009d..43d4bd15 100644 --- a/roles/mgrote.zfs_sanoid/defaults/main.yml +++ b/roles/mgrote.zfs_sanoid/defaults/main.yml @@ -45,17 +45,3 @@ frequent_period: '0' autosnap: 'yes' autoprune: 'yes' - - -# weg - - ### under which user the script is run - sanoid_user_group: "root" - sanoid_user: "sanoid" - - ### where to store the logfile - sanoid_log_file: "/var/log/sanoid-cron.log" - - ### where to download the binary + config - sanoid_dl_url: "https://raw.githubusercontent.com/jimsalterjrs/sanoid/master/sanoid" - sanoid_dl_conf_url: "https://raw.githubusercontent.com/jimsalterjrs/sanoid/master/sanoid.defaults.conf" diff --git a/roles/mgrote.zfs_sanoid/tasks/main.yml b/roles/mgrote.zfs_sanoid/tasks/main.yml index 3eda612c..43ab8e76 100644 --- a/roles/mgrote.zfs_sanoid/tasks/main.yml +++ b/roles/mgrote.zfs_sanoid/tasks/main.yml @@ -1,7 +1,4 @@ --- - - name: include user tasks # entfernen - include_tasks: user.yml - - name: install packages become: true ansible.builtin.package: @@ -14,6 +11,6 @@ ansible.builtin.template: src: sanoid.conf.j2 dest: /etc/sanoid/sanoid.conf - owner: "{{ sanoid_user }}" - group: "{{ sanoid_user_group }}" + owner: root + group: root mode: 0644 diff --git a/roles/mgrote.zfs_sanoid/tasks/user.yml b/roles/mgrote.zfs_sanoid/tasks/user.yml deleted file mode 100644 index 815a4b8e..00000000 --- a/roles/mgrote.zfs_sanoid/tasks/user.yml +++ /dev/null @@ -1,25 +0,0 @@ ---- - - - name: ensure user exists # ENTRFERNERN!!!!! - become: true - ansible.builtin.user: - name: "{{ sanoid_user }}" - group: "{{ sanoid_user_group }}" - shell: /usr/sbin/nologin - create_home: no - state: absent - - - name: add user to sudoers # ENTRFERNERN!!!!! - become: true - ansible.builtin.blockinfile: - path: /etc/sudoers - state: absent - block: | - {{ sanoid_user }} ALL=(ALL) NOPASSWD:ALL - validate: '/usr/sbin/visudo -cf %s' - backup: yes - marker_begin: sanoid-sudoers BEGIN - marker_end: sanoid-sudoers END - when: - - sanoid_user_group is defined - - sanoid_user is defined