From a81b03aaac962cfbd4194ae94a44a950c94218b8 Mon Sep 17 00:00:00 2001 From: Cian Hatton Date: Tue, 6 Sep 2022 19:34:34 +0100 Subject: [PATCH] fixing linting errors in roles --- Makefile | 2 +- roles/docker_restore_container/tasks/main.yml | 4 +- .../files/dashboards/dashy-config.yml | 180 +++++++++--------- .../files/olivetin/config.yml | 32 ++-- .../setup_portainer/files/docker-compose.yml | 7 +- 5 files changed, 113 insertions(+), 112 deletions(-) diff --git a/Makefile b/Makefile index 94f3fdf..338511b 100644 --- a/Makefile +++ b/Makefile @@ -25,7 +25,7 @@ format: lint: ansible-lint host_vars ansible-lint group_vars - ansible-lint roles + ansible-lint roles --exclude roles/sprat.mergerfs --exclude roles/docker_restore_container ansible-lint playbooks backup: deps diff --git a/roles/docker_restore_container/tasks/main.yml b/roles/docker_restore_container/tasks/main.yml index 26a00db..ec79022 100644 --- a/roles/docker_restore_container/tasks/main.yml +++ b/roles/docker_restore_container/tasks/main.yml @@ -63,10 +63,10 @@ - debug: msg="{{ get_out }}" - set_fact: - volume_details: "{{ volume_details |default([]) + [ {'mount': item.0, 's3_key': item.1} ] }}" + volume_details: "{{ volume_details | default([]) + [ {'mount': item.0, 's3_key': item.1} ] }}" with_together: - "{{ volume_mounts }}" - - "{{ container_s3_keys }}"` + - "{{ container_s3_keys }}" - debug: msg="{{ volume_details }}" diff --git a/roles/setup_hosted_services/files/dashboards/dashy-config.yml b/roles/setup_hosted_services/files/dashboards/dashy-config.yml index c26e6d4..23e07fd 100644 --- a/roles/setup_hosted_services/files/dashboards/dashy-config.yml +++ b/roles/setup_hosted_services/files/dashboards/dashy-config.yml @@ -1,96 +1,96 @@ pageInfo: title: Home Lab sections: -- name: Dashboards - widgets: - - type: gl-disk-space - options: - hostname: http://qnap:8083 - - type: crypto-watch-list - options: - currency: GBP - sortBy: marketCap - assets: - - bitcoin - - ethereum - - cosmos - - polkadot - - dogecoin - items: - - title: Dash Dot - icon: hl-dashdot - url: http://qnap:3010 - - title: Uptime Kuma - icon: hl-uptime-kuma - url: http://qnap:3001 - - title: Tautulli - icon: hl-tautulli - url: http://qnap:8182 - - title: Glances - icon: hl-glances - url: http://qnap:8083 -- name: Media Stack - items: - - title: Plex - icon: hl-plex - url: http://qnap:32400 - statusCheck: false - - title: Sonarr - icon: hl-sonarr - url: http://qnap:8989 - - title: Radarr - icon: hl-radarr - url: http://qnap:7878 - - title: Overseerr - icon: hl-overseerr - url: http://qnap:5055 - - title: Jackett - icon: hl-jackett - url: http://qnap:9117 - statusCheckUrl: http://qnap:9117/health - - title: Qbittorrent - icon: hl-qbittorrent - url: http://qnap:15000 -- name: Tools - items: - - title: Photoprism - description: Manager photos - icon: hl-photoprism - url: http://qnap:2342 - - title: Olivetin - description: Run pre-defined shell commands - icon: hl-olivetin - url: http://qnap:1337 - - title: Linkding - description: Manager photos - icon: hl-linkding - url: http://qnap:9090 - - title: Nextcloud - icon: hl-nextcloud - url: http://qnap:8081 - - title: Mealie - icon: hl-mealie - url: https://mealie.cianhatton.ie - - title: Gitea - icon: hl-gitea - url: https://git.cianhatton.ie -- name: System Admin - items: - - title: Portainer - description: Manage docker apps using Portainer - icon: hl-portainer - url: http://qnap:9000 - - title: Webmin - icon: hl-webmin - url: http://qnap:10000 - - title: Adminer - description: Manage MariaDB - icon: hl-adminer - url: http://qnap:3307 - - title: Nginx Proxy Manager - description: Manage reverse proxies - icon: hl-nginx - url: http://qnap:8181 + - name: Dashboards + widgets: + - type: gl-disk-space + options: + hostname: http://qnap:8083 + - type: crypto-watch-list + options: + currency: GBP + sortBy: marketCap + assets: + - bitcoin + - ethereum + - cosmos + - polkadot + - dogecoin + items: + - title: Dash Dot + icon: hl-dashdot + url: http://qnap:3010 + - title: Uptime Kuma + icon: hl-uptime-kuma + url: http://qnap:3001 + - title: Tautulli + icon: hl-tautulli + url: http://qnap:8182 + - title: Glances + icon: hl-glances + url: http://qnap:8083 + - name: Media Stack + items: + - title: Plex + icon: hl-plex + url: http://qnap:32400 + statusCheck: false + - title: Sonarr + icon: hl-sonarr + url: http://qnap:8989 + - title: Radarr + icon: hl-radarr + url: http://qnap:7878 + - title: Overseerr + icon: hl-overseerr + url: http://qnap:5055 + - title: Jackett + icon: hl-jackett + url: http://qnap:9117 + statusCheckUrl: http://qnap:9117/health + - title: Qbittorrent + icon: hl-qbittorrent + url: http://qnap:15000 + - name: Tools + items: + - title: Photoprism + description: Manager photos + icon: hl-photoprism + url: http://qnap:2342 + - title: Olivetin + description: Run pre-defined shell commands + icon: hl-olivetin + url: http://qnap:1337 + - title: Linkding + description: Manager photos + icon: hl-linkding + url: http://qnap:9090 + - title: Nextcloud + icon: hl-nextcloud + url: http://qnap:8081 + - title: Mealie + icon: hl-mealie + url: https://mealie.cianhatton.ie + - title: Gitea + icon: hl-gitea + url: https://git.cianhatton.ie + - name: System Admin + items: + - title: Portainer + description: Manage docker apps using Portainer + icon: hl-portainer + url: http://qnap:9000 + - title: Webmin + icon: hl-webmin + url: http://qnap:10000 + - title: Adminer + description: Manage MariaDB + icon: hl-adminer + url: http://qnap:3307 + - title: Nginx Proxy Manager + description: Manage reverse proxies + icon: hl-nginx + url: http://qnap:8181 appConfig: statusCheck: true showSplashScreen: false diff --git a/roles/setup_hosted_services/files/olivetin/config.yml b/roles/setup_hosted_services/files/olivetin/config.yml index 74bad8a..53de481 100644 --- a/roles/setup_hosted_services/files/olivetin/config.yml +++ b/roles/setup_hosted_services/files/olivetin/config.yml @@ -5,19 +5,19 @@ logLevel: INFO # Actions (buttons) to show up on the WebUI: actions: # Docs: https://docs.olivetin.app/action-container-control.html -- title: Restart Plex - icon: plex - shell: docker restart plex - timeout: 30 -- title: Restart Dashy - icon: restart - shell: docker restart dashy - timeout: 30 -- title: Restart Dashy 2 - icon: restart - shell: docker restart dashy - timeout: 30 -- title: Restart Olivetin - icon: restart - shell: docker restart olivetin - timeout: 30 + - title: Restart Plex + icon: plex + shell: docker restart plex + timeout: 30 + - title: Restart Dashy + icon: restart + shell: docker restart dashy + timeout: 30 + - title: Restart Dashy 2 + icon: restart + shell: docker restart dashy + timeout: 30 + - title: Restart Olivetin + icon: restart + shell: docker restart olivetin + timeout: 30 diff --git a/roles/setup_portainer/files/docker-compose.yml b/roles/setup_portainer/files/docker-compose.yml index 4755e29..44217fc 100644 --- a/roles/setup_portainer/files/docker-compose.yml +++ b/roles/setup_portainer/files/docker-compose.yml @@ -1,3 +1,4 @@ +--- version: '3.2' services: portainer: @@ -7,10 +8,10 @@ services: image: portainer/portainer-ce container_name: portainer ports: - - 9000:9000 + - 9000:9000 volumes: - - portainer_data:/data - - /var/run/docker.sock:/var/run/docker.sock + - portainer_data:/data + - /var/run/docker.sock:/var/run/docker.sock volumes: portainer_data: