diff --git a/.vscode/settings.json b/.vscode/settings.json index 27557a5..cbc727b 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,3 +1,3 @@ { - "ansible.python.interpreterPath": "/usr/bin/python" + "ansible.python.interpreterPath": "/workspace/dev/ansible/minilab/.venv/bin/python" } \ No newline at end of file diff --git a/collections/ansible_collections/adhdgirl/minilab/roles/adguardhome/tasks/main.yaml b/collections/ansible_collections/adhdgirl/minilab/roles/adguardhome/tasks/main.yaml index 65e2978..c74fce4 100644 --- a/collections/ansible_collections/adhdgirl/minilab/roles/adguardhome/tasks/main.yaml +++ b/collections/ansible_collections/adhdgirl/minilab/roles/adguardhome/tasks/main.yaml @@ -32,7 +32,7 @@ tags: docker,adguard community.docker.docker_compose_v2: project_src: /opt/adguard - pull: policy + pull: always rescue: - name: Set that this task failed diff --git a/collections/ansible_collections/adhdgirl/minilab/roles/adguardhome_sync/tasks/main.yaml b/collections/ansible_collections/adhdgirl/minilab/roles/adguardhome_sync/tasks/main.yaml index fc0de52..6946e05 100644 --- a/collections/ansible_collections/adhdgirl/minilab/roles/adguardhome_sync/tasks/main.yaml +++ b/collections/ansible_collections/adhdgirl/minilab/roles/adguardhome_sync/tasks/main.yaml @@ -37,7 +37,7 @@ tags: docker,adguard community.docker.docker_compose_v2: project_src: /opt/adguardhome-sync - pull: policy + pull: always rescue: - name: Set that this task failed diff --git a/collections/ansible_collections/adhdgirl/minilab/roles/arr/files/homarr.yaml b/collections/ansible_collections/adhdgirl/minilab/roles/arr/files/homarr.yaml deleted file mode 100644 index 0a1205e..0000000 --- a/collections/ansible_collections/adhdgirl/minilab/roles/arr/files/homarr.yaml +++ /dev/null @@ -1,13 +0,0 @@ ---- -services: - homarr: - container_name: homarr - image: ghcr.io/homarr-labs/homarr:${HOMARR_TAG:-latest} - restart: unless-stopped - volumes: - - /var/run/docker.sock:/var/run/docker.sock # Optional, only if you want docker integration - - /opt/arr/homarr/appdata:/appdata - environment: - - SECRET_ENCRYPTION_KEY=9b51b9a6e1d604f76d43f26bf852b3344741d9563f1554193e6155b42647f7fe - ports: - - "7575:7575" diff --git a/collections/ansible_collections/adhdgirl/minilab/roles/arr/files/lidarr.yaml b/collections/ansible_collections/adhdgirl/minilab/roles/arr/files/lidarr.yaml deleted file mode 100644 index bf20b27..0000000 --- a/collections/ansible_collections/adhdgirl/minilab/roles/arr/files/lidarr.yaml +++ /dev/null @@ -1,16 +0,0 @@ ---- -services: - lidarr: - container_name: lidarr - image: ghcr.io/hotio/lidarr:${LIDARR_TAG:-latest} - ports: - - "8686:8686" - environment: - - PUID=1000 - - PGID=10000 - - UMASK=002 - - TZ=America/New_York - - WEBUI_PORTS=8686/tcp - volumes: - - /opt/arr/lidarr/config:/config - - /mnt/storage:/data diff --git a/collections/ansible_collections/adhdgirl/minilab/roles/arr/files/prowlarr.yaml b/collections/ansible_collections/adhdgirl/minilab/roles/arr/files/prowlarr.yaml deleted file mode 100644 index 1b423eb..0000000 --- a/collections/ansible_collections/adhdgirl/minilab/roles/arr/files/prowlarr.yaml +++ /dev/null @@ -1,15 +0,0 @@ ---- -services: - prowlarr: - container_name: prowlarr - image: ghcr.io/hotio/prowlarr:${PROWLARR_TAG:-latest} - ports: - - "9696:9696" - environment: - - PUID=1000 - - PGID=10000 - - UMASK=002 - - TZ=America/New_York - - WEBUI_PORTS=9696/tcp - volumes: - - /opt/arr/prowlarr/config:/config diff --git a/collections/ansible_collections/adhdgirl/minilab/roles/arr/files/radarr.yaml b/collections/ansible_collections/adhdgirl/minilab/roles/arr/files/radarr.yaml deleted file mode 100644 index 4c5478e..0000000 --- a/collections/ansible_collections/adhdgirl/minilab/roles/arr/files/radarr.yaml +++ /dev/null @@ -1,16 +0,0 @@ ---- -services: - radarr: - container_name: radarr - image: ghcr.io/hotio/radarr:${RADARR_TAG:-latest} - ports: - - "7878:7878" - environment: - - PUID=1000 - - PGID=10000 - - UMASK=002 - - TZ=America/New_York - - WEBUI_PORTS=7878/tcp - volumes: - - /opt/arr/radarr/config:/config - - /mnt/storage:/data diff --git a/collections/ansible_collections/adhdgirl/minilab/roles/arr/files/sabnzbd.yaml b/collections/ansible_collections/adhdgirl/minilab/roles/arr/files/sabnzbd.yaml deleted file mode 100644 index b551081..0000000 --- a/collections/ansible_collections/adhdgirl/minilab/roles/arr/files/sabnzbd.yaml +++ /dev/null @@ -1,15 +0,0 @@ ---- -services: - sabnzbd: - image: lscr.io/linuxserver/sabnzbd:${SABNZBD_TAG:-latest} - container_name: sabnzbd - environment: - - PUID=1000 - - PGID=10000 - - TZ=America/New_York - volumes: - - /opt/arr/sabnzbd/config:/config - - /mnt/storage:/data - ports: - - 8081:8080 - restart: unless-stopped diff --git a/collections/ansible_collections/adhdgirl/minilab/roles/arr/files/sonarr.yaml b/collections/ansible_collections/adhdgirl/minilab/roles/arr/files/sonarr.yaml deleted file mode 100644 index ac7ea9a..0000000 --- a/collections/ansible_collections/adhdgirl/minilab/roles/arr/files/sonarr.yaml +++ /dev/null @@ -1,16 +0,0 @@ ---- -services: - sonarr: - container_name: sonarr - image: ghcr.io/hotio/sonarr:${SONARR_TAG:-latest} - ports: - - "8989:8989" - environment: - - PUID=1000 - - PGID=10000 - - UMASK=002 - - TZ=America/New_York - - WEBUI_PORTS=8989/tcp - volumes: - - /opt/arr/sonarr/config:/config - - /mnt/storage:/data diff --git a/collections/ansible_collections/adhdgirl/minilab/roles/arr/tasks/main.yaml b/collections/ansible_collections/adhdgirl/minilab/roles/arr/tasks/main.yaml deleted file mode 100644 index 7a02248..0000000 --- a/collections/ansible_collections/adhdgirl/minilab/roles/arr/tasks/main.yaml +++ /dev/null @@ -1,73 +0,0 @@ ---- -- name: Load distro-specific variables - ansible.builtin.include_vars: '{{ item }}' - tags: always - with_first_found: - - files: - - "{{ ansible_facts['distribution'] }}.yaml" - skip: true - -- name: Ensure Arr stack is running on this device - block: - - name: Ensure presense of folders for arr stack - tags: packages,docker,arr,sabnzbd - ansible.builtin.file: - path: "/opt/arr/{{ item }}" - state: directory - recurse: true - owner: 1000 - group: 1000 - loop: - - "sabnzbd/config" - - "radarr/config" - - "sonarr/config" - - "lidarr/config" - - "prowlarr/config" - - "homarr/appdata" - - name: Ensure environment files are present for arr stack - tags: packages,docker,arr,sabnzbd - ansible.builtin.template: - src: env.j2 - dest: /opt/arr/{{ item }}/.env - owner: root - group: root - mode: u=rw,g=r,o=r - loop: - - "sabnzbd" - - "radarr" - - "sonarr" - - "lidarr" - - "prowlarr" - - "homarr" - - name: Ensure compose files are present for arr stack - tags: packages,docker,arr,sabnzbd - ansible.builtin.copy: - src: "{{ item }}.yaml" - dest: "/opt/arr/{{ item }}/docker-compose.yaml" - owner: 1000 - group: 1000 - mode: u=rw,g=r,o=r - loop: - - "sabnzbd" - - "radarr" - - "sonarr" - - "lidarr" - - "prowlarr" - - "homarr" - - name: Ensure docker containers are pulled and running - tags: docker,arr,sabnzbd - community.docker.docker_compose_v2: - project_src: /opt/arr/{{ item }} - pull: policy - loop: - - "sabnzbd" - - "radarr" - - "sonarr" - - "lidarr" - - "prowlarr" - - "homarr" - - rescue: - - name: Set that this task failed - ansible.builtin.set_fact: - task_failed: true diff --git a/collections/ansible_collections/adhdgirl/minilab/roles/arr/templates/env.j2 b/collections/ansible_collections/adhdgirl/minilab/roles/arr/templates/env.j2 deleted file mode 100644 index 2a25aa4..0000000 --- a/collections/ansible_collections/adhdgirl/minilab/roles/arr/templates/env.j2 +++ /dev/null @@ -1,6 +0,0 @@ -SABNZBD_TAG={{ arr_sabnzbd_tag }} -RADARR_TAG={{ arr_radarr_tag }} -SONARR_TAG={{ arr_sonarr_tag }} -LIDARR_TAG={{ arr_lidarr_tag }} -PROWLARR_TAG={{ arr_prowlarr_tag }} -HOMARR_TAG={{ arr_homarr_tag }} diff --git a/collections/ansible_collections/adhdgirl/minilab/roles/arr/templates/smbcredentials.j2 b/collections/ansible_collections/adhdgirl/minilab/roles/arr/templates/smbcredentials.j2 deleted file mode 100644 index 40e5e85..0000000 --- a/collections/ansible_collections/adhdgirl/minilab/roles/arr/templates/smbcredentials.j2 +++ /dev/null @@ -1,2 +0,0 @@ -username={{ arr_smb_username }} -password={{ arr_smb_password }} diff --git a/collections/ansible_collections/adhdgirl/minilab/roles/arr/vars/main.yaml b/collections/ansible_collections/adhdgirl/minilab/roles/arr/vars/main.yaml deleted file mode 100644 index 7e04c07..0000000 --- a/collections/ansible_collections/adhdgirl/minilab/roles/arr/vars/main.yaml +++ /dev/null @@ -1,6 +0,0 @@ -arr_sabnzbd_tag: 4.5.5 -arr_radarr_tag: release-6.0.4.10291 -arr_sonarr_tag: release-4.0.16.2944 -arr_lidarr_tag: release-3.1.0.4875 -arr_prowlarr_tag: release-2.3.0.5236 -arr_homarr_tag: v1.50.1 diff --git a/collections/ansible_collections/adhdgirl/minilab/roles/authentik/files/docker-compose.yaml b/collections/ansible_collections/adhdgirl/minilab/roles/authentik/files/docker-compose.yaml index 5c6a599..5e58f42 100644 --- a/collections/ansible_collections/adhdgirl/minilab/roles/authentik/files/docker-compose.yaml +++ b/collections/ansible_collections/adhdgirl/minilab/roles/authentik/files/docker-compose.yaml @@ -1,7 +1,7 @@ --- services: postgresql: - image: postgres:16-alpine + image: docker.io/library/postgres:16-alpine restart: unless-stopped healthcheck: test: ["CMD-SHELL", "pg_isready -d $${POSTGRES_DB} -U $${POSTGRES_USER}"] @@ -18,7 +18,7 @@ services: env_file: - .env redis: - image: redis:alpine + image: docker.io/library/redis:alpine command: --save 60 1 --loglevel warning restart: unless-stopped healthcheck: diff --git a/collections/ansible_collections/adhdgirl/minilab/roles/authentik/tasks/main.yaml b/collections/ansible_collections/adhdgirl/minilab/roles/authentik/tasks/main.yaml index f2ac53f..94358d3 100644 --- a/collections/ansible_collections/adhdgirl/minilab/roles/authentik/tasks/main.yaml +++ b/collections/ansible_collections/adhdgirl/minilab/roles/authentik/tasks/main.yaml @@ -40,7 +40,7 @@ tags: docker,authentik community.docker.docker_compose_v2: project_src: /opt/authentik - pull: policy + pull: always rescue: - name: Set that this task failed diff --git a/collections/ansible_collections/adhdgirl/minilab/roles/caddy/tasks/main.yaml b/collections/ansible_collections/adhdgirl/minilab/roles/caddy/tasks/main.yaml index 061083e..a3bb954 100644 --- a/collections/ansible_collections/adhdgirl/minilab/roles/caddy/tasks/main.yaml +++ b/collections/ansible_collections/adhdgirl/minilab/roles/caddy/tasks/main.yaml @@ -40,7 +40,7 @@ tags: docker,caddy community.docker.docker_compose_v2: project_src: /opt/caddy - pull: policy + pull: always rescue: - name: Set that this task failed diff --git a/collections/ansible_collections/adhdgirl/minilab/roles/caddy/templates/Caddyfile.j2 b/collections/ansible_collections/adhdgirl/minilab/roles/caddy/templates/Caddyfile.j2 index 207c214..bdf8254 100644 --- a/collections/ansible_collections/adhdgirl/minilab/roles/caddy/templates/Caddyfile.j2 +++ b/collections/ansible_collections/adhdgirl/minilab/roles/caddy/templates/Caddyfile.j2 @@ -30,26 +30,3 @@ guac.local.cobb.lgbt { flush_interval -1 } } - -homarr.local.cobb.lgbt { - reverse_proxy 10.69.2.52:7575 -} -sabnzbd.local.cobb.lgbt { - reverse_proxy 10.69.2.52:8081 -} -sonarr.local.cobb.lgbt { - reverse_proxy 10.69.2.52:8989 -} -radarr.local.cobb.lgbt { - reverse_proxy 10.69.2.52:7878 -} -prowlarr.local.cobb.lgbt { - reverse_proxy 10.69.2.52:9696 -} -lidarr.local.cobb.lgbt { - reverse_proxy 10.69.2.52:8686 -} - -ha.local.cobb.lgbt { - reverse_proxy 10.69.2.13:8123 -} diff --git a/collections/ansible_collections/adhdgirl/minilab/roles/coder/tasks/main.yaml b/collections/ansible_collections/adhdgirl/minilab/roles/coder/tasks/main.yaml index 2ccbdf7..cfd0c6f 100644 --- a/collections/ansible_collections/adhdgirl/minilab/roles/coder/tasks/main.yaml +++ b/collections/ansible_collections/adhdgirl/minilab/roles/coder/tasks/main.yaml @@ -40,7 +40,7 @@ tags: docker,coder community.docker.docker_compose_v2: project_src: "/opt/coder" - pull: policy + pull: always rescue: - name: Set that this task failed diff --git a/collections/ansible_collections/adhdgirl/minilab/roles/unifi-controller/tasks/main.yaml b/collections/ansible_collections/adhdgirl/minilab/roles/unifi-controller/tasks/main.yaml index 010206b..c7aa4e4 100644 --- a/collections/ansible_collections/adhdgirl/minilab/roles/unifi-controller/tasks/main.yaml +++ b/collections/ansible_collections/adhdgirl/minilab/roles/unifi-controller/tasks/main.yaml @@ -40,7 +40,7 @@ tags: docker,unifi community.docker.docker_compose_v2: project_src: "/opt/unifi" - pull: policy + pull: always rescue: - name: Set that this task failed diff --git a/doit b/doit index 01dfc1f..847a2f2 100755 --- a/doit +++ b/doit @@ -2,12 +2,4 @@ clear echo "" > ansible.log -ANSIBLE_PATH=ansible-playbook - -if hash ansible-playbook 2>/dev/null; then - ANSIBLE_PATH=ansible-playbook -else - ANSIBLE_PATH=./.venv/bin/ansible-playbook -fi - -$ANSIBLE_PATH --vault-password-file vault-password.txt minilab.yaml $@ +/workspace/dev/ansible/minilab/.venv/bin/ansible-playbook --vault-password-file vault-password.txt minilab.yaml $@ diff --git a/inventory/hosts.yaml b/inventory/hosts.yaml index 1bfca8f..2bacec6 100644 --- a/inventory/hosts.yaml +++ b/inventory/hosts.yaml @@ -15,7 +15,7 @@ all: # ansible_host: 10.69.1.50 reir: ansible_host: 10.69.9.11 - trady: + trady: ansible_host: 10.69.2.11 stephanie: ansible_host: 10.69.2.51 @@ -66,6 +66,3 @@ all: caddy: hosts: nemetona: - arr: - hosts: - nemetona: diff --git a/minilab.yaml b/minilab.yaml index aae7d02..d51e7c5 100644 --- a/minilab.yaml +++ b/minilab.yaml @@ -52,6 +52,5 @@ tags: docker,authentik,caddy become: true roles: - # - adhdgirl.minilab.authentik + - adhdgirl.minilab.authentik - adhdgirl.minilab.caddy - - adhdgirl.minilab.arr