Merge remote-tracking branch 'origin/master'

Author: owine

roles/cadvisor/defaults/main.yml

@@ -34,7 +34,7 @@ cadvisor_docker_image: "gcr.io/cadvisor/cadvisor:{{ cadvisor_docker_image_tag }}
 cadvisor_docker_ports_defaults: []
 cadvisor_docker_ports_custom: []
 cadvisor_docker_ports: "{{ cadvisor_docker_ports_defaults
-                          + cadvisor_docker_ports_custom }}"
+                           + cadvisor_docker_ports_custom }}"
 
 # Envs
 cadvisor_docker_envs_default:
@@ -58,21 +58,21 @@ cadvisor_docker_volumes_default:
   - "/dev/disk/:/dev/disk:ro"
 cadvisor_docker_volumes_custom: []
 cadvisor_docker_volumes: "{{ cadvisor_docker_volumes_default
-                            + cadvisor_docker_volumes_custom }}"
+                             + cadvisor_docker_volumes_custom }}"
 
 # Devices
 cadvisor_docker_devices_default:
   - /dev/kmsg
 cadvisor_docker_devices_custom: []
 cadvisor_docker_devices: "{{ cadvisor_docker_devices_default
-                            + cadvisor_docker_devices_custom }}"
+                             + cadvisor_docker_devices_custom }}"
 
 # Hosts
 cadvisor_docker_hosts_default: []
 cadvisor_docker_hosts_custom: []
 cadvisor_docker_hosts: "{{ docker_hosts_common
-                          | combine(cadvisor_docker_hosts_default)
-                          | combine(cadvisor_docker_hosts_custom) }}"
+                           | combine(cadvisor_docker_hosts_default)
+                           | combine(cadvisor_docker_hosts_custom) }}"
 
 # Labels
 cadvisor_docker_labels_default: {}
@@ -102,7 +102,7 @@ cadvisor_docker_capabilities: "{{ cadvisor_docker_capabilities_default
 cadvisor_docker_security_opts_default: []
 cadvisor_docker_security_opts_custom: []
 cadvisor_docker_security_opts: "{{ cadvisor_docker_security_opts_default
-                                  + cadvisor_docker_security_opts_custom }}"
+                                   + cadvisor_docker_security_opts_custom }}"
 
 # Restart Policy
 cadvisor_docker_restart_policy: unless-stopped

roles/cloudplow/defaults/main.yml

@@ -13,6 +13,18 @@
 
 cloudplow_name: cloudplow
 
+################################
+# Settings
+################################
+
+# Default for all remotes.
+cloudplow_remote_default_folder: "/Media"
+
+# To change the folder for a specific remote:
+# cloudplow_remote_movies_folder: "/Media/Movies"
+# cloudplow_remote_dropbox_folder: "Media"
+# cloudplow_remote_nameofremote_folder: "targetfolder"
+
 ################################
 # Paths
 ################################

roles/cloudplow/templates/config.json.j2

@@ -56,9 +56,17 @@
         }
       },
       "remove_empty_dir_depth": 2,
-      "sync_remote": "{{ (remote.remote if ':' in remote.remote else remote.remote + ':/Media') if (remote.template != 'nfs') else ('/mnt/remote/' + remote.remote.split(':')[0] if ':' in remote.remote else remote.remote) + '/Media' }}",
+      "sync_remote": "{{ (remote.remote if ':' in remote.remote else remote.remote
+                          + ':' + lookup('vars', 'cloudplow_remote_' + (remote.remote.split(':')[0] if ':' in remote.remote else remote.remote) + '_folder', default=cloudplow_remote_default_folder))
+                          if (remote.template != 'nfs')
+                          else ('/mnt/remote/' + remote.remote.split(':')[0] if ':' in remote.remote else remote.remote)
+                          + lookup('vars', 'cloudplow_remote_' + (remote.remote.split(':')[0] if ':' in remote.remote else remote.remote) + '_folder', default=cloudplow_remote_default_folder) }}",
       "upload_folder": "{{ remote.upload_from }}",
-      "upload_remote": "{{ (remote.remote if ':' in remote.remote else remote.remote + ':/Media') if (remote.template != 'nfs') else ('/mnt/remote/' + remote.remote.split(':')[0] if ':' in remote.remote else remote.remote) + '/Media' }}"
+      "upload_remote": "{{ (remote.remote if ':' in remote.remote else remote.remote
+                            + ':' + lookup('vars', 'cloudplow_remote_' + (remote.remote.split(':')[0] if ':' in remote.remote else remote.remote) + '_folder', default=cloudplow_remote_default_folder))
+                            if (remote.template != 'nfs')
+                            else ('/mnt/remote/' + remote.remote.split(':')[0] if ':' in remote.remote else remote.remote)
+                            + lookup('vars', 'cloudplow_remote_' + (remote.remote.split(':')[0] if ':' in remote.remote else remote.remote) + '_folder', default=cloudplow_remote_default_folder) }}"
     {% if loop.index == loop.length %}}{% else %}},{{ '\n' }}{% endif %}
 {% endfor %}
 

roles/node_exporter/templates/node_exporter.service.j2

@@ -1,4 +1,4 @@
-# /etc/systemd/system/{{ cloudplow_service_name }}.service
+# /etc/systemd/system/node_exporter.service
 #########################################################################
 # Title:         Saltbox: Node Exporter Service                         #
 # Author(s):     salty                                                  #

roles/prometheus/tasks/main.yml

@@ -34,7 +34,7 @@
     dest: "{{ prometheus_config_path }}"
     owner: "{{ user.name }}"
     group: "{{ user.name }}"
-    mode: "0775"
+    mode: "0644"
     force: false
 
 - name: Create Docker container

roles/remote/tasks/remote.yml

@@ -195,5 +195,5 @@
 - name: "Remote | Display error message when Rclone remote is not configured properly"
   ansible.builtin.fail:
     msg:
-      - "Rclone remote '{{ rclone_remote_with_path }}' is not configured properly."
+      - "Rclone remote '{{ rclone_remote_with_path }}' does not exist in 'rclone listremotes' for user: {{ user.name }}."
   when: (not rclone_remote_is_configured)