refactor: restructure inventory, split roles and add new services

roles/xray-lists/tasks/install.yml

@@ -18,9 +18,14 @@
     - /opt/xray-lists
     - /var/lib/xray-lists
 
+- name: create python venv for xray-lists
+  command: python3 -m venv /opt/xray-lists/venv
+  args:
+    creates: /opt/xray-lists/venv/bin/pip
+
 - name: clone xray-lists repository
   git:
-    repo: 'https://gitea.oyacoi.ru/pyrschtjag/xray-lists'
+    repo: "http://10.1.0.104:3000/pyrschtjag/xray-lists.git"
     dest: /opt/xray-lists-src
     version: main
     force: yes
@@ -37,72 +42,20 @@
 
 - name: deploy update helper script
   copy:
+    src: update.sh
     dest: /var/lib/xray-lists/update.sh
     owner: root
     group: root
     mode: '0755'
-    content: |
-      #!/bin/sh
 
-      set -e
-      out=$(/opt/xray-lists/venv/bin/xray-lists)
-
-      echo "$out"
-      
-      dns_changed=0
-      elements_changed=0
-      
-      if echo "$out" | grep -A 10 "changed:" | grep -q "nftsets.conf"; then dns_changed=1; fi
-      if echo "$out" | grep -A 10 "changed:" | grep -q "\.elements\.nft"; then elements_changed=1; fi
-      
-      if [ "$dns_changed" -eq 1 ] && [ "$elements_changed" -eq 1 ]; then exit 12;
-      elif [ "$dns_changed" -eq 1 ]; then exit 10;
-      elif [ "$elements_changed" -eq 1 ]; then exit 11;
-      fi
-
-      exit 0
-
-- name: deploy systemd service unit
+- name: deploy systemd service and timer unit
   copy:
-    dest: /etc/systemd/system/xray-lists.service
+    src: "{{ item }}"
+    dest: "/etc/systemd/system/{{ item }}"
     owner: root
     group: root
     mode: '0644'
-    content: |
-      [Unit]
-      Description=Update Xray lists
-
-      [Service]
-      Type=oneshot
-      ExecStart=/bin/sh -c '\
-      /var/lib/xray-lists/update.sh; \
-      rc=$$?; \
-      case "$$rc" in \
-          10) systemctl restart dnsmasq ;; \
-          11) nft -f /etc/nftables.conf ;; \
-          12) nft -f /etc/nftables.conf && systemctl restart dnsmasq ;; \
-      esac'
-
-- name: deploy systemd timer unit
-  copy:
-    dest: /etc/systemd/system/xray-lists.timer
-    owner: root
-    group: root
-    mode: '0644'
-    content: |
-      [Unit]
-      Description=Run xray-lists update daily and on boot
-
-      [Timer]
-      OnBootSec=5min
-      OnUnitActiveSec=12h
-      Persistent=true
-
-      [Install]
-      WantedBy=timers.target
-
-- name: enable and start xray-lists
-  ansible.builtin.systemd:
-    name: xray-lists.timer
-    enabled: true
-    state: started
+  loop:
+    - xray-lists.service
+    - xray-lists.timer
+  notify: run xray-lists systemd timer unit