diff --git a/arr/compose.yaml b/arr/compose.yaml index 09cb1d6..6a3889f 100644 --- a/arr/compose.yaml +++ b/arr/compose.yaml @@ -151,7 +151,7 @@ services: caddy.2_import: authentik readarr-audiobooks: - image: ghcr.io/firewalkwithm3/readarr:latest + image: lscr.io/linuxserver/readarr:develop container_name: readarr-audiobooks networks: - default @@ -171,7 +171,7 @@ services: caddy.2_import: authentik readarr-ebooks: - image: ghcr.io/firewalkwithm3/readarr:latest + image: lscr.io/linuxserver/readarr:develop container_name: readarr-ebooks networks: - default diff --git a/linkwarden/compose.yaml b/linkwarden/compose.yaml deleted file mode 100644 index 1ed65b5..0000000 --- a/linkwarden/compose.yaml +++ /dev/null @@ -1,50 +0,0 @@ -services: - linkwarden_db: - image: postgres:16-alpine - container_name: linkwarden_db - environment: - - POSTGRES_USER=linkwarden - - POSTGRES_PASSWORD=${POSTGRES_PASSWORD} - - POSTGRES_DB=linkwarden - restart: always - volumes: - - /mnt/docker/linkwarden/database:/var/lib/postgresql/data - networks: - - default - linkwarden: - image: ghcr.io/linkwarden/linkwarden:latest - environment: - - DATABASE_URL=postgresql://linkwarden:${POSTGRES_PASSWORD}@linkwarden_db:5432/linkwarden - - MEILI_HOST=linkwarden_search - - NEXTAUTH_URL=https://linkwarden.ferngarden.net/api/v1/auth - - NEXTAUTH_SECRET=${NEXTAUTH_SECRET} - - NEXT_PUBLIC_AUTHENTIK_ENABLED=true - - AUTHENTIK_ISSUER=https://auth.fern.garden/application/o/linkwarden - - AUTHENTIK_CLIENT_ID=${AUTHENTIK_CLIENT_ID} - - AUTHENTIK_CLIENT_SECRET=${AUTHENTIK_CLIENT_SECRET} - restart: always - volumes: - - /mnt/docker/linkwarden/data:/data/data - depends_on: - - linkwarden_db - - linkwarden_search - networks: - - default - - proxy - labels: - caddy: linkwarden.ferngarden.net - caddy.import: internal - caddy.reverse_proxy: '{{ upstreams 3000 }}' - linkwarden_search: - image: getmeili/meilisearch:v1.12.8 - container_name: linkwarden_search - restart: always - volumes: - - /mnt/docker/linkwarden/search:/meili_data - networks: - - default - -networks: - default: - proxy: - external: true diff --git a/obsidian-livesync/compose.yaml b/obsidian-livesync/compose.yaml deleted file mode 100644 index 1abce43..0000000 --- a/obsidian-livesync/compose.yaml +++ /dev/null @@ -1,27 +0,0 @@ -services: - obsidian-livesync: - container_name: obsidian-livesync - image: couchdb:latest - user: 1000:1000 - environment: - - TZ=Australia/Perth - - COUCHDB_USER=obsidian - - COUCHDB_PASSWORD=${COUCHDB_PASSWORD} - volumes: - - /mnt/docker/obsidian-livesync/data:/opt/couchdb/data - - /mnt/docker/obsidian-livesync/etc/local.d:/opt/couchdb/etc/local.d - ports: - - 5984:5984 - networks: - - default - - proxy - restart: unless-stopped - labels: - caddy: obsidian-livesync.ferngarden.net - caddy.import: internal - caddy.reverse_proxy: '{{ upstreams 5984 }}' - -networks: - default: - proxy: - external: true \ No newline at end of file diff --git a/resources.toml b/resources.toml index 0197ec5..d95f3b6 100644 --- a/resources.toml +++ b/resources.toml @@ -56,7 +56,7 @@ auto_update = true linked_repo = "github" run_directory = "arr" environment = """ -QBITTORRENT_PASSWORD=[[QBITTORRENT_PASSWORD]] +QBITTORRENT__PASSWORD=[[QBITTORRENT_PASSWORD]] """ ## @@ -237,7 +237,6 @@ run_directory = "jellyfin" environment = """ JELLYSTAT_JWT_SECRET=[[JELLYSTAT_JWT_SECRET]] JELLYSTAT_POSTGRES_PASSWORD=[[JELLYSTAT_DB_PASSWORD]] -JELLYSTAT_PASSWORD=[[JELLYSTAT_PASSWORD]] """ ## @@ -255,24 +254,6 @@ run_directory = "komga" ## -[[stack]] -name = "linkwarden" -tags = ["internal"] -[stack.config] -server = "docker.local" -auto_update = true -linked_repo = "github" -run_directory = "linkwarden" -environment = """ -NEXTAUTH_SECRET=[[LINKWARDEN_NEXTAUTH_SECRET]] -POSTGRES_PASSWORD=[[LINKWARDEN_DB_PASSWORD]] -MEILI_MASTER_KEY=[[LINKWARDEN_MEILI_MASTER_KEY]] -AUTHENTIK_CLIENT_ID=[[LINKWARDEN_AUTHENTIK_CLIENT_ID]] -AUTHENTIK_CLIENT_SECRET=[[LINKWARDEN_AUTHENTIK_CLIENT_SECRET]] -""" - -## - [[stack]] name = "mailserver" tags = ["internal"] @@ -501,31 +482,6 @@ OIDC_CLIENT_SECRET=[[ROMM_OIDC_CLIENT_SECRET]] ## -[[stack]] -name = "scrutiny" -[stack.config] -server = "docker.local" -auto_update = true -linked_repo = "github" -run_directory = "scrutiny" - -## - -[[stack]] -name = "slskd" -[stack.config] -server = "docker.local" -poll_for_updates = true -auto_update = true -linked_repo = "github" -run_directory = "slskd" -environment = """ -SLSKD_PASSWORD=[[SLSKD_PASSWORD]] -SLSKD_SLSK_PASSWORD=[[SOULSEEK_PASSWORD]] -""" - -## - [[stack]] name = "stash" tags = ["internal", "media"] diff --git a/vaultwarden/compose.yaml b/vaultwarden/compose.yaml index 4befeb0..0444cc7 100644 --- a/vaultwarden/compose.yaml +++ b/vaultwarden/compose.yaml @@ -11,7 +11,7 @@ services: - SMTP_HOST=mail.ferngarden.net - SMTP_PORT=587 - SMTP_SECURITY=starttls - - SMTP_FROM=ornithologist@ferngarden.net + - SMTP_FROM=Vaultwarden - SMTP_USERNAME=ornithologist@ferngarden.net - SMTP_PASSWORD=${SMTP_PASSWORD} volumes: