Merge remote-tracking branch 'origin/main'

roles/deluge/tasks/main.yml

@@ -16,7 +16,7 @@
         pull: true
         volumes:
           - "{{ deluge_config_directory }}:/config:rw"
-          - "{{ deluge_download_directory }}:/root/Downloads:rw"
+          - "{{ deluge_download_directory }}:/downloads:rw"
         ports:
           - "{{ deluge_port }}:8112"
         env:

roles/portainer/defaults/main.yml

@@ -8,6 +8,7 @@ portainer_data_directory: "{{ docker_home }}/portainer/config"
 # network
 portainer_port: "9000"
 portainer_hostname: "portainer"
+portainer_ip_whitelist: "0.0.0.0/0"
 
 # docker
 portainer_container_name: "portainer"

roles/portainer/tasks/main.yml

@@ -28,6 +28,8 @@
           traefik.http.routers.portainer.tls.domains[0].main: "{{ ansible_nas_domain }}"
           traefik.http.routers.portainer.tls.domains[0].sans: "*.{{ ansible_nas_domain }}"
           traefik.http.services.portainer.loadbalancer.server.port: "9443"
+          traefik.http.routers.portainer.middlewares: "portainer-ipwhitelist@docker"
+          traefik.http.middlewares.portainer-ipwhitelist.ipwhitelist.sourcerange: "{{ portainer_ip_whitelist }}"
   when: portainer_enabled is true
 
 - name: Stop Portainer