diff --git a/group_vars/all/vars.yml b/group_vars/all/vars.yml index 5afd11c..47b529c 100644 --- a/group_vars/all/vars.yml +++ b/group_vars/all/vars.yml @@ -6,7 +6,7 @@ timezone: Europe/Berlin rclone_config: "/root/.config/rclone/" puid: 1000 pgid: 1000 -pk_path: "/media/veracrypt1/genesis" +pk_path: "/mnt/veracrypt1/genesis" local_domain: borg.land local_subdomains: "@" @@ -332,7 +332,8 @@ bin_upload: "{{ docker_data_dir }}/{{bin_host}}/upload" qbit_port: "8082" qbit_host: "qbit" qbit_config: "templates/aya01/qbittorrentvpn/config" -qbit_ovpn_config: "openvpn/ae.protonvpn.net.udp.ovpn" +qbit_old_ovpn_config: "openvpn/ae.protonvpn.net.udp.ovpn" +qbit_ovpn_config: "openvpn/hu.protonvpn.net.udp.ovpn" qbit_remote_config: "{{ docker_dir }}/{{ qbit_host }}/config" qbit_downloads: "{{ arr_downloads }}" diff --git a/qbit_private.yml b/qbit_private.yml index 68a90bf..326fbf3 100644 --- a/qbit_private.yml +++ b/qbit_private.yml @@ -12,6 +12,12 @@ - "{{ qbit_downloads }}" become: true +- name: Remove old opnvpn-config + file: + path: "{{ qbit_remote_config }}/{{ qbit_old_ovpn_config }}" + state: absent + become: true + - name: Copy ovpn_torrentleech-config template: owner: "{{ puid }}" diff --git a/roles/docker/tasks/main.yml b/roles/docker/tasks/main.yml index 343faf7..b3a7bd2 100644 --- a/roles/docker/tasks/main.yml +++ b/roles/docker/tasks/main.yml @@ -14,6 +14,12 @@ # tags: # - reload_compose +- name: Copy the compose file + template: + src: templates/{{ inventory_hostname }}/compose.yaml + dest: "{{ docker_compose_dir }}/compose.yaml" + register: compose + - include_tasks: "{{ inventory_hostname }}_compose.yml" tags: - reload_compose diff --git a/roles/docker/tasks/qbit.yml b/roles/docker/tasks/qbit.yml index 4999a13..73a4eab 100644 --- a/roles/docker/tasks/qbit.yml +++ b/roles/docker/tasks/qbit.yml @@ -12,6 +12,12 @@ - "{{ qbit_downloads }}" become: true +- name: Remove old opnvpn-config + file: + path: "{{ qbit_remote_config }}/{{ qbit_old_ovpn_config }}" + state: absent + become: true + - name: Copy ovpn-config template: owner: "{{ puid }}"