diff --git a/playbooks/build_tasmota_v2.yml b/playbooks/build_tasmota_v2.yml index ea5da47..b2abba8 100755 --- a/playbooks/build_tasmota_v2.yml +++ b/playbooks/build_tasmota_v2.yml @@ -5,6 +5,10 @@ # DOCKER_IMAGE: docker-tasmota # FWS: tasmota tasks: + - name: Pull tasmota + ansible.builtin.shell: + cmd: 'git config --global --add safe.directory /share/docker_data/docker-tasmota/Tasmota' + - name: Fetch tasmota ansible.builtin.shell: cmd: 'git fetch https://github.com/arendst/Tasmota.git {{ BRANCH }}' @@ -32,13 +36,13 @@ - name: Build tasmota ansible.builtin.shell: - cmd: '/share/ZFS530_DATA/.qpkg/container-station/bin/docker run --rm -v /share/docker_data/docker-tasmota/Tasmota:/tasmota -u $UID:$GID {{ DOCKER_IMAGE }} -e {{ FWS }}' + cmd: 'docker run --rm -v /share/docker_data/docker-tasmota/Tasmota:/tasmota -u $UID:$GID {{ DOCKER_IMAGE }} -e {{ FWS }}' chdir: /share/docker_data/docker-tasmota/ when: FWS != "all" - name: Build tasmota ansible.builtin.shell: - cmd: '/share/ZFS530_DATA/.qpkg/container-station/bin/docker run --rm -v /share/docker_data/docker-tasmota/Tasmota:/tasmota -u $UID:$GID {{ DOCKER_IMAGE }}' + cmd: 'docker run --rm -v /share/docker_data/docker-tasmota/Tasmota:/tasmota -u $UID:$GID {{ DOCKER_IMAGE }}' chdir: /share/docker_data/docker-tasmota/ when: FWS == "all" diff --git a/roles/omv_backup/tasks/main.yml b/roles/omv_backup/tasks/main.yml index bf62f15..b69f846 100755 --- a/roles/omv_backup/tasks/main.yml +++ b/roles/omv_backup/tasks/main.yml @@ -34,7 +34,15 @@ owner: root group: root when: inventory_hostname != 'nas.home.lan' - + - name: Upload script + ansible.builtin.copy: + src: "{{ dest_folder }}/omv_backup_v2.py" + dest: /myapps/omv_backup_v2.py + remote_src: true + mode: '0755' + owner: root + group: root + when: inventory_hostname != 'nas.home.lan' - name: Upload requirements ansible.builtin.copy: src: "{{ dest_folder }}/requirements.txt" @@ -57,13 +65,33 @@ name: "omv_backup" state: absent - - name: Ensure a job that runs at 2 and 5 exists. Creates an entry like "0 5,2 * * ls -alh > /dev/null" - ansible.builtin.cron: - name: "omv_backup" - minute: "0" - hour: "8" - job: "/myapps/venv/bin/python3 /myapps/omv_backup.py -b > /dev/null 2>&1 &" + # - name: Ensure a job that runs at 2 and 5 exists. Creates an entry like "0 5,2 * * ls -alh > /dev/null" + # ansible.builtin.cron: + # name: "omv_backup" + # minute: "0" + # hour: "8" + # job: "/myapps/venv/bin/python3 /myapps/omv_backup.py -b > /dev/null 2>&1 &" + - name: Creating config + ansible.builtin.copy: + dest: "/etc/systemd/system/omv_backup.service" + content: | + [Unit] + Description=Enable OMV backup + [Service] + ExecStart = nohup /myapps/venv/bin/python3 /myapps/omv_backup_v2.py -b > /dev/null 2>&1 & + [Install] + WantedBy=basic.target + owner: root + mode: '0744' + - name: Restart service omv_backup, in all cases + ansible.builtin.service: + name: omv_backup + state: restarted + enabled: true + # async: + # poll: 0 + # ignore_errors: true become: true