making progress

Linode/cleanup.yml

@@ -9,6 +9,7 @@
   vars:
     cleanup_redirector: "{{ (redirector_name is defined and redirector_name != '') | ternary(true, false) }}"
     cleanup_c2: "{{ (c2_name is defined and c2_name != '') | ternary(true, false) }}"
+    cleanup_tracker: "{{ (tracker_name is defined and tracker_name != '') | ternary(true, false) }}"
     confirm_cleanup: "{{ confirm_cleanup | default(true) }}"
 
   tasks:
@@ -31,6 +32,9 @@
           {% if cleanup_c2 and c2_name is defined %}
           - C2 instance: {{ c2_name }}
           {% endif %}
+          {% if cleanup_tracker and tracker_name is defined %}
+          - Tracker instance: {{ tracker_name }}
+          {% endif %}
       when: confirm_cleanup | bool
 
     - name: Confirm cleanup operation
@@ -61,6 +65,15 @@
       register: c2_deletion
       ignore_errors: yes
       
+    - name: Delete tracker instance
+      community.general.linode_v4:
+        access_token: "{{ linode_token }}"
+        label: "{{ tracker_name }}"
+        state: absent
+      when: cleanup_tracker and tracker_name is defined and tracker_name != ""
+      register: tracker_deletion
+      ignore_errors: yes
+      
     - name: Report cleanup status
       debug:
         msg: |
@@ -70,4 +83,7 @@
           {% endif %}
           {% if c2_deletion is defined %}
           - C2 {{ c2_name }}: {{ c2_deletion.changed | ternary('Deleted', 'Not found/Could not delete') }}
+          {% endif %}
+          {% if tracker_deletion is defined %}
+          - Tracker {{ tracker_name }}: {{ tracker_deletion.changed | ternary('Deleted', 'Not found/Could not delete') }}
           {% endif %}

Linode/tracker.yml

@@ -8,10 +8,10 @@
   vars_files:
     - vars.yaml
   vars:
-    # Default values
+    # Default values - using minimalist settings
     linode_region: "{{ linode_region | default(region_choices | random) }}"
     plan: "{{ plan | default('g6-nanode-1') }}"  # Use smallest plan for tracker
-    tracker_image: "linode/debian12"
+    tracker_image: "{{ image | default('linode/debian12') }}"  # Use Debian instead of Kali
     
     # Generate random instance name if not provided
     tracker_name: "{{ tracker_name | default('t-' + 9999999999 | random | to_uuid | hash('md5') | truncate(8, True, '')) }}"
@@ -67,15 +67,15 @@
   vars:
     tracker_domain: "{{ tracker_domain | default('track.' + domain) }}"
   tasks:
-    - name: Update and install required packages
+    - name: Update and install minimal required packages
       apt:
         name:
           - nginx
           - certbot
           - python3-certbot-nginx
           - git
-          - curl
           - python3-pip
+          - python3-venv
         update_cache: yes
         state: present
 
@@ -89,6 +89,8 @@
     - name: Install tracker dependencies
       pip:
         requirements: /opt/tracker/requirements.txt
+        virtualenv: /opt/tracker/venv
+        virtualenv_command: python3 -m venv
       ignore_errors: yes
 
     - name: Configure tracker settings
@@ -115,6 +117,14 @@
         mode: '0644'
       ignore_errors: yes
 
+    - name: Update tracker service to use virtualenv
+      blockinfile:
+        path: /etc/systemd/system/tracker.service
+        insertafter: "^\\[Service\\]"
+        block: |
+          Environment="PATH=/opt/tracker/venv/bin:$PATH"
+          ExecStart=/opt/tracker/venv/bin/python /opt/tracker/app.py
+
     - name: Start and enable tracker service
       systemd:
         name: tracker