qbittorrent: allow override of qbittorrent_docker_ports_56881 on a pe…

…r instance basis
saltyorg · Jun 18, 2023 · 1cb3b82 · 1cb3b82
1 parent 75bc2d5
commit 1cb3b82
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/roles/qbittorrent/defaults/main.yml b/roles/qbittorrent/defaults/main.yml
@@ -120,8 +120,8 @@ qbittorrent_docker_ports_8080: "{{ port_lookup_8080.meta.port
 qbittorrent_web_port_lookup: "{{ lookup('vars', qbittorrent_name + '_web_port', default=qbittorrent_web_port) }}"
 
 qbittorrent_docker_ports_defaults:
-  - "{{ qbittorrent_docker_ports_56881 }}:{{ qbittorrent_docker_ports_56881 }}"
-  - "{{ qbittorrent_docker_ports_56881 }}:{{ qbittorrent_docker_ports_56881 }}/udp"
+  - "{{ lookup('vars', qbittorrent_name + '_docker_ports_56881', default=qbittorrent_docker_ports_56881) }}:{{ lookup('vars', qbittorrent_name + '_docker_ports_56881', default=qbittorrent_docker_ports_56881) }}"
+  - "{{ lookup('vars', qbittorrent_name + '_docker_ports_56881', default=qbittorrent_docker_ports_56881) }}:{{ lookup('vars', qbittorrent_name + '_docker_ports_56881', default=qbittorrent_docker_ports_56881) }}/udp"
 qbittorrent_docker_ports_custom: []
 qbittorrent_docker_ports: "{{ lookup('vars', qbittorrent_name + '_docker_ports_defaults', default=qbittorrent_docker_ports_defaults)
                               + lookup('vars', qbittorrent_name + '_docker_ports_custom', default=qbittorrent_docker_ports_custom) }}"

diff --git a/roles/qbittorrent/tasks/subtasks/pre-install/main.yml b/roles/qbittorrent/tasks/subtasks/pre-install/main.yml
@@ -36,7 +36,7 @@
         path: "{{ qbittorrent_paths_conf }}"
         section: BitTorrent
         option: Session\Port
-        value: "{{ qbittorrent_docker_ports_56881 }}"
+        value: "{{ lookup('vars', qbittorrent_name + '_docker_ports_56881', default=qbittorrent_docker_ports_56881) }}"
         no_extra_spaces: true
         state: present
         owner: "{{ user.name }}"