move directories into servers.yml

group_vars/servers.yml

@@ -4,8 +4,6 @@ backups:
     monthly: "monthly"
     nightly: "nightly"
 
-docker_compose_directory: /etc/docker-compose
-
 # TODO: docker_volume_backup exists in vault. Clean this up.
 dockervolumebackup:
   image: ghcr.io/chatton/docker-volume-backup
@@ -39,3 +37,19 @@ shares:
   - /share/public_files
   - /share/private_files
   - /share/cian_files
+
+directories:
+  # path on qnap where downloads go
+  downloads_dir: /mnt/ssd0/downloads
+  # path on qnap where plex transcoding happens
+  transcoding_dir: /mnt/ssd0/transcoding
+  # path on qnap where movies are stored
+  movies_dir: /mnt/mergerfs/media/movies
+  # path on qnap where tv shows are stored
+  tv_dir: /mnt/mergerfs/media/tv
+  # path on qnap where docker compose files are stored
+  docker_compose_directory: /etc/docker-compose
+  # path on qnap where backups are stored
+  backups_dir: /mnt/mergerfs/backups
+  # path where photoprism photos are stored
+  photoprism_dir: /mnt/mergerfs/photoprism

hosts.ini

@@ -1,12 +1,12 @@
 # group qnap and linode to run operations on.
 # this ensures we don't run everything on localhost as well.
 [servers:children]
-qnap
+qnaps
-linode
+linodes
 
-[qnap]
+[qnaps]
 qnap
 
 # BEGIN ANSIBLE MANAGED BLOCK
-[linode]
+[linodes]
 # END ANSIBLE MANAGED BLOCK

roles/bootstrap/meta/main.yml

@@ -0,0 +1,53 @@
+galaxy_info:
+  author: Cian Hatton
+  namespace: chatton
+  description: your role description
+  company: your company (optional)
+
+  # If the issue tracker for your role is not on github, uncomment the
+  # next line and provide a value
+  # issue_tracker_url: http://example.com/issue/tracker
+
+  # Choose a valid license ID from https://spdx.org - some suggested licenses:
+  # - BSD-3-Clause (default)
+  # - MIT
+  # - GPL-2.0-or-later
+  # - GPL-3.0-only
+  # - Apache-2.0
+  # - CC-BY-4.0
+  license: MIT
+
+  min_ansible_version: 2.1
+
+  # If this a Container Enabled role, provide the minimum Ansible Container version.
+  # min_ansible_container_version:
+
+  #
+  # Provide a list of supported platforms, and for each platform a list of versions.
+  # If you don't wish to enumerate all versions for a particular platform, use 'all'.
+  # To view available platforms and versions (or releases), visit:
+  # https://galaxy.ansible.com/api/v1/platforms/
+  #
+  # platforms:
+  # - name: Fedora
+  #   versions:
+  #   - all
+  #   - 25
+  # - name: SomePlatform
+  #   versions:
+  #   - all
+  #   - 1.0
+  #   - 7
+  #   - 99.99
+
+  galaxy_tags: []
+    # List tags for your role here, one per line. A tag is a keyword that describes
+    # and categorizes the role. Users find roles by searching for tags. Be sure to
+    # remove the '[]' above, if you add tags to this list.
+    #
+    # NOTE: A tag is limited to a single word comprised of alphanumeric characters.
+    #       Maximum 20 tags per role.
+
+dependencies: []
+  # List your role dependencies here, one per line. Be sure to remove the '[]' above,
+  # if you add dependencies to this list.

roles/setup_docker/meta/main.yml

@@ -1,53 +1,10 @@
 galaxy_info:
   author: Cian Hatton
   namespace: chatton
-  description: your role description
+  description: Bootstrap ansible
   company: your company (optional)
-
-  # If the issue tracker for your role is not on github, uncomment the
-  # next line and provide a value
-  # issue_tracker_url: http://example.com/issue/tracker
-
-  # Choose a valid license ID from https://spdx.org - some suggested licenses:
-  # - BSD-3-Clause (default)
-  # - MIT
-  # - GPL-2.0-or-later
-  # - GPL-3.0-only
-  # - Apache-2.0
-  # - CC-BY-4.0
   license: MIT
-
   min_ansible_version: 2.1
-
-  # If this a Container Enabled role, provide the minimum Ansible Container version.
-  # min_ansible_container_version:
-
-  #
-  # Provide a list of supported platforms, and for each platform a list of versions.
-  # If you don't wish to enumerate all versions for a particular platform, use 'all'.
-  # To view available platforms and versions (or releases), visit:
-  # https://galaxy.ansible.com/api/v1/platforms/
-  #
-  # platforms:
-  # - name: Fedora
-  #   versions:
-  #   - all
-  #   - 25
-  # - name: SomePlatform
-  #   versions:
-  #   - all
-  #   - 1.0
-  #   - 7
-  #   - 99.99
-
   galaxy_tags: []
-    # List tags for your role here, one per line. A tag is a keyword that describes
-    # and categorizes the role. Users find roles by searching for tags. Be sure to
-    # remove the '[]' above, if you add tags to this list.
-    #
-    # NOTE: A tag is limited to a single word comprised of alphanumeric characters.
-    #       Maximum 20 tags per role.
 
 dependencies: []
-  # List your role dependencies here, one per line. Be sure to remove the '[]' above,
-  # if you add dependencies to this list.

roles/setup_hosted_services/defaults/main.yml

@@ -1,16 +1 @@
 ---
-qnap:
-  # path on qnap where downloads go
-  downloads_dir: /mnt/ssd0/downloads
-  # path on qnap where plex transcoding happens
-  transcoding_dir: /mnt/ssd0/transcoding
-  # path on qnap where movies are stored
-  movies_dir: /mnt/mergerfs/media/movies
-  # path on qnap where tv shows are stored
-  tv_dir: /mnt/mergerfs/media/tv
-  # path on qnap where docker compose files are stored
-  docker_compose_directory: /etc/docker-compose
-  # path on qnap where backups are stored
-  backups_dir: /mnt/mergerfs/backups
-  # path where photoprism photos are stored
-  photoprism_dir: /mnt/mergerfs/photoprism

roles/setup_hosted_services/tasks/main.yml

@@ -9,7 +9,7 @@
 
 - name: Docker Compose | Create a directory if it does not exist
   file:
-    path: "{{qnap.docker_compose_directory}}/{{item.name}}"
+    path: "{{directories.docker_compose_directory}}/{{item.name}}"
     state: directory
     mode: '0755'
   with_items: "{{services}}"
@@ -17,11 +17,11 @@
 - name: Docker Compose | Template Docker Compose Files
   template:
     src: "{{item.name}}.j2"
-    dest: "{{qnap.docker_compose_directory}}/{{item.name}}/docker-compose.yml"
+    dest: "{{directories.docker_compose_directory}}/{{item.name}}/docker-compose.yml"
   with_items: "{{services}}"
 
 
-- name: Config Files | Create a directory if it does not exist
+- name: Directories | Ensure required directories
   file:
     path: "{{item}}"
     state: directory
@@ -30,6 +30,7 @@
     - "{{dashy.config_directory}}"
     - "{{olivetin.config_directory}}"
     - "{{dockervolumebackup.config_directory}}"
+    - "{{directories.backups_dir}}/.s3tmp"
 
 - name: Dashy | Config Files
   copy:
@@ -69,7 +70,7 @@
   environment:
     EXISTING_VOLUMES: "{{ find_volumes.results | map(attribute='stdout_lines') | list | flatten }}"
     SERVICES: "{{ services }}"
-    DOCKER_COMPOSE_DIR: "{{qnap.docker_compose_directory}}"
+    DOCKER_COMPOSE_DIR: "{{directories.docker_compose_directory}}"
   args:
     executable: python3
   register: python_output
@@ -107,7 +108,7 @@
   chatton.portainer.portainer_stack:
     username: admin
     password: "{{portainer.password}}"
-    docker_compose_file_path: "{{qnap.docker_compose_directory}}/{{ item.name }}/docker-compose.yml"
+    docker_compose_file_path: "{{directories.docker_compose_directory}}/{{ item.name }}/docker-compose.yml"
     stack_name: "{{ item.name }}"
     endpoint_id: "{{ item.endpoint_id }}"
     state: present
@@ -116,6 +117,6 @@
 - name: Docker compose | Update Stack
   when: container_deployment_mode == "compose"
   docker_compose:
-    project_src: "{{qnap.docker_compose_directory}}/{{ item.name }}"
+    project_src: "{{directories.docker_compose_directory}}/{{ item.name }}"
     state: present
   with_items: "{{services}}"

roles/setup_hosted_services/templates/docker-volume-backup.j2

@@ -16,6 +16,6 @@ services:
 
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
-      - {{qnap.backups_dir}}:/backups
+      - {{directories.backups_dir}}:/backups
       - /tmp:/tmp
       - {{dockervolumebackup.config_directory}}/config.yml:{{dockervolumebackup.config_directory}}/config.yml

roles/setup_hosted_services/templates/docker-volume-backup/config.j2

@@ -7,11 +7,11 @@ periodic_backups:
       - name: "Nightly backup to local filesystem"
         type: "filesystem"
         filesystem_options:
-            host_path: {{ qnap.backups_dir }}
+            host_path: {{ directories.backups_dir }}
       - name: "Backup to iDrive E2"
         type: "s3"
         s3_options:
-            host_path: {{ qnap.backups_dir }}
+            host_path: {{ directories.backups_dir }}
             aws_access_key_id: {{ docker_volume_backup.aws_access_key_id }}
             aws_secret_access_key: {{ docker_volume_backup.aws_secret_access_key }}
             aws_default_region: {{ docker_volume_backup.aws_default_region }}
@@ -24,11 +24,11 @@ periodic_backups:
       - name: "Monthly backup to local filesystem"
         type: "filesystem"
         filesystem_options:
-            host_path: {{ qnap.backups_dir }}
+            host_path: {{ directories.backups_dir }}
       - name: "Backup to iDrive E2"
         type: "s3"
         s3_options:
-            host_path: {{ qnap.backups_dir }}
+            host_path: {{ directories.backups_dir }}
             aws_access_key_id: {{ docker_volume_backup.aws_access_key_id }}
             aws_secret_access_key: {{ docker_volume_backup.aws_secret_access_key }}
             aws_default_region: {{ docker_volume_backup.aws_default_region }}

roles/setup_hosted_services/templates/photoprism.j2

@@ -43,9 +43,9 @@ services:
       - "/dev/dri:/dev/dri"                         # Intel QSV
     working_dir: "/photoprism" # do not change or remove
     volumes:
-      - {{ qnap.photoprism_dir}}/originals:/photoprism/originals               # Original media files (DO NOT REMOVE)
+      - {{ directories.photoprism_dir}}/originals:/photoprism/originals               # Original media files (DO NOT REMOVE)
-      - {{ qnap.photoprism_dir}}/import:/photoprism/import                # *Optional* base folder from which files can be imported to originals
+      - {{ directories.photoprism_dir}}/import:/photoprism/import                # *Optional* base folder from which files can be imported to originals
-      - {{ qnap.photoprism_dir}}/storage:/photoprism/storage                 # *Writable* storage folder for cache, database, and sidecar files (DO NOT REMOVE)
+      - {{ directories.photoprism_dir}}/storage:/photoprism/storage                 # *Writable* storage folder for cache, database, and sidecar files (DO NOT REMOVE)
 
 
 networks:

roles/setup_hosted_services/templates/plex.j2

@@ -16,9 +16,9 @@ services:
       - VERSION=docker
     volumes:
       - config:/config
-      - {{ qnap.tv_dir }}:/tv
+      - {{ directories.tv_dir }}:/tv
-      - {{ qnap.movies_dir }}:/movies
+      - {{ directories.movies_dir }}:/movies
-      - {{ qnap.transcoding_dir }}:/transcoding
+      - {{ directories.transcoding_dir }}:/transcoding
     restart: unless-stopped
     devices:
       - /dev/dri:/dev/dri

roles/setup_hosted_services/templates/vpn-stack.j2

@@ -48,7 +48,7 @@ services:
       - WEBUI_PORT=15000
     volumes:
       - qbittorrent_config:/config
-      - {{ qnap.downloads_dir }}:/downloads
+      - {{ directories.downloads_dir }}:/downloads
     restart: unless-stopped
 
   radarr:
@@ -66,8 +66,8 @@ services:
       - TZ=Europe/London
     volumes:
       - radarr_config:/config
-      - {{ qnap.movies_dir }}:/movies
+      - {{ directories.movies_dir }}:/movies
-      - {{ qnap.downloads_dir }}:/downloads
+      - {{ directories.downloads_dir }}:/downloads
     restart: unless-stopped
 
   sonarr:
@@ -85,8 +85,8 @@ services:
       - TZ=Europe/London
     volumes:
       - sonarr_config:/config
-      - {{ qnap.tv_dir }}:/tv
+      - {{ directories.tv_dir }}:/tv
-      - {{ qnap.downloads_dir }}:/downloads
+      - {{ directories.downloads_dir }}:/downloads
     restart: unless-stopped
 
   jackett:
@@ -105,7 +105,7 @@ services:
       - AUTO_UPDATE=true
     volumes:
       - jackett_config:/config
-      - {{ qnap.downloads_dir }}:/downloads
+      - {{ directories.downloads_dir }}:/downloads
     restart: unless-stopped
 
 volumes:

roles/setup_portainer/tasks/main.yml

@@ -9,14 +9,14 @@
 ---
 - name: Portainer | Create directory if it does not exist
   ansible.builtin.file:
-    path: "{{docker_compose_directory}}"
+    path: "{{directories.docker_compose_directory}}"
     state: directory
     mode: '0755'
 
 - name: Portainer | Copy docker compose file
   copy:
     src: docker-compose.yml
-    dest: "{{docker_compose_directory}}/docker-compose.yml"
+    dest: "{{directories.docker_compose_directory}}/docker-compose.yml"
 
 - name: Portainer | Check if volume exists
   shell: docker volume ls -f name=portainer_portainer_data --format '{{ '{{' }}  .Name {{ '}}' }}'
@@ -53,7 +53,7 @@
 
 - name: Portainer | Docker compose up
   community.docker.docker_compose:
-    project_src: "{{docker_compose_directory}}/portainer"
+    project_src: "{{directories.docker_compose_directory}}/portainer"
 
 # Don't really need this as long as there is an S3 backup.
 #- name: Portainer | Register Admin User

setup-homelab.yml

@@ -26,7 +26,7 @@
     - role: 'roles/setup_hosted_services'
       tags: ["services"]
 
-- hosts: linode
+- hosts: linodes
   become: true
 
   pre_tasks:

verify-homelab.yml

@@ -1,5 +1,5 @@
 ---
-- hosts: linode
+- hosts: linodes
   tasks:
       # TODO
       # Verify sudoers