diff --git a/inventories/group_vars/all.yml b/inventories/group_vars/all.yml index 4b462872cc..7bdfa93d2e 100644 --- a/inventories/group_vars/all.yml +++ b/inventories/group_vars/all.yml @@ -65,7 +65,7 @@ rclone_remote_is_defined: "{{ (rclone is defined) and (rclone.remotes is not none) and (rclone.remotes | length > 0) }}" -use_remote: "{{ rclone_remote_is_defined }}" +use_remote: true use_nvidia: "{{ gpu.nvidia | bool }}" diff --git a/roles/docker/tasks/main.yml b/roles/docker/tasks/main.yml index 94e526226c..9bdbd7be5b 100644 --- a/roles/docker/tasks/main.yml +++ b/roles/docker/tasks/main.yml @@ -37,7 +37,7 @@ ansible.builtin.set_fact: _remotes_services_list: "{{ _remotes_services_list | default('') + (rclone_service_template + item.remote + '.service ') }}" with_items: "{{ rclone.remotes }}" - when: use_remote + when: rclone_remote_is_defined - name: Tasks for when Docker exists and is running when: docker_binary.stat.exists and docker_service_running diff --git a/roles/docker/templates/override.conf.j2 b/roles/docker/templates/override.conf.j2 index 370772ec29..cb2304d95b 100644 --- a/roles/docker/templates/override.conf.j2 +++ b/roles/docker/templates/override.conf.j2 @@ -9,7 +9,7 @@ ######################################################################### [Unit] -{% if use_remote and not continuous_integration %} +{% if rclone_remote_is_defined and not continuous_integration %} After={{ _remotes_services_list if rclone_remote_is_defined else '' }}{{ docker_service_after }} Requires={{ _remotes_services_list if rclone_remote_is_defined else '' }}{{ docker_service_after }} {% else %} diff --git a/roles/remote/tasks/main.yml b/roles/remote/tasks/main.yml index e79ca9cce8..eb35f00ece 100644 --- a/roles/remote/tasks/main.yml +++ b/roles/remote/tasks/main.yml @@ -71,6 +71,10 @@ - "rclone_refresh.service" - "rclone_refresh.timer" +- name: Run systemd daemon-reload + ansible.builtin.systemd: + daemon_reload: true + - name: Populate Service Facts ansible.builtin.service_facts: @@ -98,3 +102,4 @@ - name: Remote Tasks ansible.builtin.include_tasks: "remote.yml" with_items: "{{ rclone.remotes }}" + when: rclone_remote_is_defined diff --git a/roles/remote/tasks/remote.yml b/roles/remote/tasks/remote.yml index ff1db46912..b9f20ede52 100644 --- a/roles/remote/tasks/remote.yml +++ b/roles/remote/tasks/remote.yml @@ -199,7 +199,7 @@ - name: Remote | Tasks when Rclone remote is configured when: rclone_remote_is_configured block: - - name: "Remote | Test Rclone remote '{{ item.remote }}:'" + - name: "Remote | Test Rclone remote '{{ item.remote }}'" ansible.builtin.shell: | rclone lsd '{{ item.remote }}:' \ --user-agent='{{ user_agent }}' diff --git a/roles/remote/templates/dropbox.j2 b/roles/remote/templates/dropbox.j2 index 6e0aa0490c..68d50842b7 100644 --- a/roles/remote/templates/dropbox.j2 +++ b/roles/remote/templates/dropbox.j2 @@ -52,7 +52,6 @@ ExecStart=/usr/bin/rclone mount \ --vfs-read-chunk-size={{ '32M' if item.vfs_cache.enabled else '64M' }} \ -v \ {{ item.remote }}:{{ lookup('vars', (item.remote | replace('-', '_') | lower) + '_folder', default="") }} /mnt/remote/{{ item.remote }} -ExecStartPost=/usr/bin/rclone rc vfs/refresh recursive=true --url http://localhost:{{ rclone_remort_port }} _async=true ExecStop=/bin/fusermount3 -uz /mnt/remote/{{ item.remote }} Restart=on-abort RestartSec=5 diff --git a/roles/remote/templates/google.j2 b/roles/remote/templates/google.j2 index 71f5b4ba1f..e06579879b 100644 --- a/roles/remote/templates/google.j2 +++ b/roles/remote/templates/google.j2 @@ -55,7 +55,6 @@ ExecStart=/usr/bin/rclone mount \ --vfs-read-chunk-size={{ '32M' if item.vfs_cache.enabled else '64M' }} \ -v \ {{ item.remote }}:{{ lookup('vars', (item.remote | replace('-', '_') | lower) + '_folder', default="") }} /mnt/remote/{{ item.remote }} -ExecStartPost=/usr/bin/rclone rc vfs/refresh recursive=true --url http://localhost:{{ rclone_remort_port }} _async=true ExecStop=/bin/fusermount3 -uz /mnt/remote/{{ item.remote }} Restart=on-abort RestartSec=5 diff --git a/roles/remote/templates/sftp.j2 b/roles/remote/templates/sftp.j2 index a7b99b9b79..6bc34d1563 100644 --- a/roles/remote/templates/sftp.j2 +++ b/roles/remote/templates/sftp.j2 @@ -41,7 +41,6 @@ ExecStart=/usr/bin/rclone mount \ {% endif %} -v \ {{ item.remote }}:{{ lookup('vars', (item.remote | replace('-', '_') | lower) + '_folder', default='/mnt/local' if item.remote == 'feeder' else '') }} /mnt/remote/{{ item.remote }} -ExecStartPost=/usr/bin/rclone rc vfs/refresh recursive=true --url http://localhost:{{ rclone_remort_port }} _async=true ExecStop=/bin/fusermount3 -uz /mnt/remote/{{ item.remote }} Restart=on-abort RestartSec=5 diff --git a/roles/unionfs/tasks/subtasks/docker/daemon.yml b/roles/unionfs/tasks/subtasks/docker/daemon.yml index 12166727ca..186bb3b94a 100644 --- a/roles/unionfs/tasks/subtasks/docker/daemon.yml +++ b/roles/unionfs/tasks/subtasks/docker/daemon.yml @@ -11,7 +11,7 @@ ansible.builtin.set_fact: _remotes_services_list: "{{ _remotes_services_list | default('') + (rclone_service_template + item.remote + '.service ') }}" with_items: "{{ rclone.remotes }}" - when: use_remote + when: rclone_remote_is_defined - name: "Docker | Daemon | Create override directory" ansible.builtin.file: diff --git a/roles/unionfs/tasks/subtasks/variables.yml b/roles/unionfs/tasks/subtasks/variables.yml index d7bbbb0895..198bd4fe3d 100644 --- a/roles/unionfs/tasks/subtasks/variables.yml +++ b/roles/unionfs/tasks/subtasks/variables.yml @@ -15,7 +15,7 @@ ansible.builtin.set_fact: _remotes_list: "{{ _remotes_list | default('') + '/mnt/remote/' + item.remote + '=NC:' }}" with_items: "{{ rclone.remotes }}" - when: use_remote and (item.remote != "feeder") + when: rclone_remote_is_defined and (item.remote != "feeder") - name: Variables | Append 'custom_mount_branch' to '_remotes_list' variable ansible.builtin.set_fact: diff --git a/saltbox.yml b/saltbox.yml index f141b61e64..3214e6b1d1 100644 --- a/saltbox.yml +++ b/saltbox.yml @@ -41,7 +41,7 @@ - { role: overseerr, tags: ['saltbox', 'mediabox', 'overseerr'] } - { role: portainer, tags: ['saltbox', 'feederbox', 'portainer'] } - { role: organizr, tags: ['saltbox', 'feederbox', 'organizr'] } - - { role: cloudplow, tags: ['saltbox', 'feederbox', 'cloudplow'], when: ['use_remote'] } + - { role: cloudplow, tags: ['saltbox', 'feederbox', 'cloudplow'], when: ['rclone_remote_is_defined'] } - { role: sonarr, tags: ['saltbox', 'feederbox', 'sonarr'] } - { role: radarr, tags: ['saltbox', 'feederbox', 'radarr'] } - { role: lidarr, tags: ['saltbox', 'feederbox', 'lidarr'] }