Resolved merge conflicts

Signed-off-by: TuDatTr <tuan-dat.tran@tudattr.dev>

group_vars/all/vars.yml

@@ -311,7 +311,6 @@ bin_upload: "{{ docker_data_dir }}/{{bin_host}}/upload"
 qbit_port: "8082"
 qbit_host: "qbit"
 qbit_config: "templates/aya01/qbittorrentvpn/config"
-qbit_ovpn_config: "openvpn/hu.protonvpn.net.udp.ovpn"
 
 qbit_remote_config: "{{ docker_dir }}/{{ qbit_host }}/config"
 qbit_downloads: "{{ arr_downloads }}"

roles/docker/tasks/aya01_compose.yml

@@ -75,10 +75,3 @@
 - include_tasks: grafana.yml
   tags:
     - grafana
-
-- name: Copy the compose file
-  template: 
-    src: templates/aya01/compose.yaml
-    dest: "{{ docker_compose_dir }}/compose.yaml"
-  register: compose
-

roles/docker/tasks/main.yml

@@ -1,28 +1,18 @@
 ---
 - include_tasks: install.yml
+
 - include_tasks: user_group_setup.yml
-# - include_tasks: pi_compose.yml
+
-#   when: inventory_hostname == "pi"
+- name: Copy the compose file
-#   tags:
+  template:
-#     - reload_compose
+    src: templates/{{ inventory_hostname }}/compose.yaml
-# - include_tasks: aya01_compose.yml
+    dest: "{{ docker_compose_dir }}/compose.yaml"
-#   when: inventory_hostname == "aya01"
+  register: compose
-#   tags:
-#     - reload_compose
-#- include_tasks: mii_compose.yml
-#  when: inventory_hostname == "mii"
-#  tags:
-#    - reload_compose
 
 - include_tasks: "{{ inventory_hostname }}_compose.yml"
   tags:
     - reload_compose
 
-- name: Shut down docker
-  shell:
-    cmd: "docker compose down --remove-orphans"
-    chdir: "{{ docker_compose_dir }}"
-
 - name: Update Docker Images
   shell:
     cmd: "docker compose pull"
@@ -30,5 +20,5 @@
 
 - name: Restart Docker
   shell:
-    cmd: "docker compose up -d"
+    cmd: "docker compose restart"
     chdir: "{{ docker_compose_dir }}"

roles/docker/tasks/mii_compose.yml

@@ -2,11 +2,3 @@
 - include_tasks: swag.yml
   tags:
     - swag
-
-- name: Copy the compose file
-  template: 
-    src: templates/mii/compose.yaml
-    dest: "{{ docker_compose_dir }}/compose.yaml"
-  tags:
-    - reload_compose
-

roles/docker/tasks/pi_compose.yml

@@ -15,10 +15,3 @@
 - include_tasks: pihole.yml
   tags:
     - pihole
-
-- name: Copy the compose file
-  template: 
-    src: templates/pi/compose.yaml
-    dest: "{{ docker_compose_dir }}/compose.yaml"
-  tags:
-    - reload_compose