diff --git a/roles/server/tasks/system_setup/cron.yml b/roles/server/tasks/system_setup/cron.yml index 2bd129c..bd4bcdd 100644 --- a/roles/server/tasks/system_setup/cron.yml +++ b/roles/server/tasks/system_setup/cron.yml @@ -4,7 +4,35 @@ state: latest when: ansible_distribution == "Archlinux" -- name: server | system_setup | cron +- name: server | system_setup | cron (VM) + tags: cron + cron: + name: "{{ item.title }}" + user: root + hour: "{{ item.hour }}" + minute: "{{ item.minute }}" + job: "{{ item.job }}" + state: present + when: + - ansible_virtualization_role == "NA" or ansible_virtualization_role == "guest" + - ansible_virtualization_type == "kvm" + loop: + - { title: "Backup", job: "/root/bin/backup_vps.bash", hour: 1, minute: 0 } + +- name: server | system_setup | cron (non VM) + tags: cron + cron: + name: "{{ item.title }}" + user: root + hour: "{{ item.hour }}" + minute: "{{ item.minute }}" + job: "{{ item.job }}" + state: absent + when: ansible_virtualization_role != "guest" or ansible_virtualization_type != "kvm" + loop: + - { title: "Backup", job: "/root/bin/backup_vps.bash", hour: 1, minute: 0 } + +- name: server | system_setup | cron (generic) tags: cron cron: name: "{{ item.title }}" @@ -13,5 +41,4 @@ minute: "{{ item.minute }}" job: "{{ item.job }}" loop: - - { title: "Send me a list of upgradeable packages", job: "apt list --upgradable", hour: 0, minute: 0 } - - { title: "Backup", job: "/root/bin/backup_vps.bash", hour: 1, minute: 0 } \ No newline at end of file + - { title: "Send me a list of upgradeable packages", job: "{{ check_update_cmd }}", hour: 0, minute: 0 } \ No newline at end of file diff --git a/roles/server/vars/Archlinux.yml b/roles/server/vars/Archlinux.yml index b43f913..3a9bcd2 100644 --- a/roles/server/vars/Archlinux.yml +++ b/roles/server/vars/Archlinux.yml @@ -3,6 +3,7 @@ snmpd_package: net-snmp snmpd_user_file: "/var/net-snmp/snmpd.conf" wireguard_package: wireguard-tools openssh_server_package: openssh +check_update_cmd: "/root/bin/cron_pacman" glusterfs_packages: - package: glusterfs \ No newline at end of file diff --git a/roles/server/vars/Debian.yml b/roles/server/vars/Debian.yml index 3b6cb19..fcf63df 100644 --- a/roles/server/vars/Debian.yml +++ b/roles/server/vars/Debian.yml @@ -3,6 +3,7 @@ snmpd_package: snmpd snmpd_user_file: "/var/lib/snmp/snmpd.conf" wireguard_package: wireguard openssh_server_package: openssh-server +check_update_cmd: "apt list --upgradable" glusterfs_packages: - package: glusterfs-common