From f3768c6de1452a4f53a197cef2ccd6efb4a2f062 Mon Sep 17 00:00:00 2001 From: Fern Garden Date: Sun, 29 Jun 2025 10:28:41 +0800 Subject: [PATCH 01/13] Add linkwarden --- linkwarden/compose.yaml | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 linkwarden/compose.yaml diff --git a/linkwarden/compose.yaml b/linkwarden/compose.yaml new file mode 100644 index 0000000..bc84f7d --- /dev/null +++ b/linkwarden/compose.yaml @@ -0,0 +1,40 @@ +services: + linkwarden_db: + image: postgres:16-alpine + container_name: linkwarden_db + env_file: linkwarden.env + restart: always + volumes: + - /mnt/docker/linkwarden/database:/var/lib/postgresql/data + networks: + - default + linkwarden: + image: ghcr.io/linkwarden/linkwarden:latest + env_file: linkwarden.env + 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 + env_file: linkwarden.env + volumes: + - /mnt/docker/linkwarden/search:/meili_data + networks: + - default + +networks: + default: + proxy: + external: true From 6002b7c71ff37cba91184e95d7491843f49bdd53 Mon Sep 17 00:00:00 2001 From: Fern Garden Date: Sun, 29 Jun 2025 10:40:54 +0800 Subject: [PATCH 02/13] Add env variables --- linkwarden/compose.yaml | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/linkwarden/compose.yaml b/linkwarden/compose.yaml index bc84f7d..9c5c12f 100644 --- a/linkwarden/compose.yaml +++ b/linkwarden/compose.yaml @@ -2,7 +2,10 @@ services: linkwarden_db: image: postgres:16-alpine container_name: linkwarden_db - env_file: linkwarden.env + environment: + - POSTGRES_USER=linkwarden + - POSTGRES_PASSWORD=${POSTGRES_PASSWORD} + - POSTGRES_DB=linkwarden restart: always volumes: - /mnt/docker/linkwarden/database:/var/lib/postgresql/data @@ -10,7 +13,10 @@ services: - default linkwarden: image: ghcr.io/linkwarden/linkwarden:latest - env_file: linkwarden.env + environment: + - DATABASE_URL=postgresql://linkwarden:${POSTGRES_PASSWORD}@linkwarden_db:5432/linkwarden + - MEILI_HOST=linkwarden_search + - NEXTAUTH_URL=https://linkwarden.ferngarden.net/api/v1/auth restart: always volumes: - /mnt/docker/linkwarden/data:/data/data @@ -28,7 +34,6 @@ services: image: getmeili/meilisearch:v1.12.8 container_name: linkwarden_search restart: always - env_file: linkwarden.env volumes: - /mnt/docker/linkwarden/search:/meili_data networks: From bbec42b7ef2e7e4998d0c2593a1836d88e84b188 Mon Sep 17 00:00:00 2001 From: komodo Date: Sun, 29 Jun 2025 10:42:06 +0800 Subject: [PATCH 03/13] [Komodo] fern: Write Compose File: update linkwarden/compose.yaml --- linkwarden/compose.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/linkwarden/compose.yaml b/linkwarden/compose.yaml index 9c5c12f..44e40fa 100644 --- a/linkwarden/compose.yaml +++ b/linkwarden/compose.yaml @@ -17,6 +17,7 @@ services: - 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} restart: always volumes: - /mnt/docker/linkwarden/data:/data/data From 33f3b859b23b8724b01f3b31c598f2348f3f8458 Mon Sep 17 00:00:00 2001 From: Fern Garden Date: Sun, 29 Jun 2025 10:52:28 +0800 Subject: [PATCH 04/13] Add authentik login for linkwarden --- linkwarden/compose.yaml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/linkwarden/compose.yaml b/linkwarden/compose.yaml index 44e40fa..305cda6 100644 --- a/linkwarden/compose.yaml +++ b/linkwarden/compose.yaml @@ -17,7 +17,14 @@ services: - DATABASE_URL=postgresql://linkwarden:${POSTGRES_PASSWORD}@linkwarden_db:5432/linkwarden - MEILI_HOST=linkwarden_search - NEXTAUTH_URL=https://linkwarden.ferngarden.net/api/v1/auth +<<<<<<< HEAD - 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} +>>>>>>> 6e7a2d8 (Add authentik login for linkwarden) restart: always volumes: - /mnt/docker/linkwarden/data:/data/data From 26ca8dc20442442695b2c169f381fe97384fec39 Mon Sep 17 00:00:00 2001 From: Fern Garden Date: Sun, 29 Jun 2025 10:57:05 +0800 Subject: [PATCH 05/13] Linkwarden env --- linkwarden/compose.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/linkwarden/compose.yaml b/linkwarden/compose.yaml index 305cda6..1ed65b5 100644 --- a/linkwarden/compose.yaml +++ b/linkwarden/compose.yaml @@ -17,14 +17,11 @@ services: - DATABASE_URL=postgresql://linkwarden:${POSTGRES_PASSWORD}@linkwarden_db:5432/linkwarden - MEILI_HOST=linkwarden_search - NEXTAUTH_URL=https://linkwarden.ferngarden.net/api/v1/auth -<<<<<<< HEAD - 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} ->>>>>>> 6e7a2d8 (Add authentik login for linkwarden) restart: always volumes: - /mnt/docker/linkwarden/data:/data/data From d751c67030844e3bf987e90cfb060f260a1d9c3e Mon Sep 17 00:00:00 2001 From: komodo Date: Sun, 29 Jun 2025 11:12:01 +0800 Subject: [PATCH 06/13] [Komodo] Commit Sync: update resources.toml --- resources.toml | 46 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 45 insertions(+), 1 deletion(-) diff --git a/resources.toml b/resources.toml index d95f3b6..0197ec5 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,6 +237,7 @@ run_directory = "jellyfin" environment = """ JELLYSTAT_JWT_SECRET=[[JELLYSTAT_JWT_SECRET]] JELLYSTAT_POSTGRES_PASSWORD=[[JELLYSTAT_DB_PASSWORD]] +JELLYSTAT_PASSWORD=[[JELLYSTAT_PASSWORD]] """ ## @@ -254,6 +255,24 @@ 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"] @@ -482,6 +501,31 @@ 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"] From 375ed5bc58ba8882fdba35085bd9583ede168921 Mon Sep 17 00:00:00 2001 From: komodo Date: Sun, 29 Jun 2025 11:26:51 +0800 Subject: [PATCH 07/13] [Komodo] fern: Write Compose File: update arr/compose.yaml --- arr/compose.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arr/compose.yaml b/arr/compose.yaml index 6a3889f..09cb1d6 100644 --- a/arr/compose.yaml +++ b/arr/compose.yaml @@ -151,7 +151,7 @@ services: caddy.2_import: authentik readarr-audiobooks: - image: lscr.io/linuxserver/readarr:develop + image: ghcr.io/firewalkwithm3/readarr:latest container_name: readarr-audiobooks networks: - default @@ -171,7 +171,7 @@ services: caddy.2_import: authentik readarr-ebooks: - image: lscr.io/linuxserver/readarr:develop + image: ghcr.io/firewalkwithm3/readarr:latest container_name: readarr-ebooks networks: - default From 415cdea1f5f82dc3164b40f68b8fb2423dde23c2 Mon Sep 17 00:00:00 2001 From: komodo Date: Sun, 29 Jun 2025 13:15:50 +0800 Subject: [PATCH 08/13] [Komodo] fern: Write Compose File: update vaultwarden/compose.yaml --- vaultwarden/compose.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vaultwarden/compose.yaml b/vaultwarden/compose.yaml index 0444cc7..744647a 100644 --- a/vaultwarden/compose.yaml +++ b/vaultwarden/compose.yaml @@ -12,7 +12,7 @@ services: - SMTP_PORT=587 - SMTP_SECURITY=starttls - SMTP_FROM=Vaultwarden - - SMTP_USERNAME=ornithologist@ferngarden.net + - SMTP_USERNAME=ornithologist - SMTP_PASSWORD=${SMTP_PASSWORD} volumes: - vaultwarden_data:/data From dcc0985754c6ecc7e34c1087ccdab751f4436140 Mon Sep 17 00:00:00 2001 From: komodo Date: Sun, 29 Jun 2025 13:17:49 +0800 Subject: [PATCH 09/13] [Komodo] fern: Write Compose File: update vaultwarden/compose.yaml --- vaultwarden/compose.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vaultwarden/compose.yaml b/vaultwarden/compose.yaml index 744647a..4befeb0 100644 --- a/vaultwarden/compose.yaml +++ b/vaultwarden/compose.yaml @@ -11,8 +11,8 @@ services: - SMTP_HOST=mail.ferngarden.net - SMTP_PORT=587 - SMTP_SECURITY=starttls - - SMTP_FROM=Vaultwarden - - SMTP_USERNAME=ornithologist + - SMTP_FROM=ornithologist@ferngarden.net + - SMTP_USERNAME=ornithologist@ferngarden.net - SMTP_PASSWORD=${SMTP_PASSWORD} volumes: - vaultwarden_data:/data From 582c7506ce6e329610c699a5d9e7255cb7782ae1 Mon Sep 17 00:00:00 2001 From: Fern Garden Date: Sun, 29 Jun 2025 13:27:11 +0800 Subject: [PATCH 10/13] Add Obsidian LiveSync --- obsidian-livesync/compose.yaml | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 obsidian-livesync/compose.yaml diff --git a/obsidian-livesync/compose.yaml b/obsidian-livesync/compose.yaml new file mode 100644 index 0000000..cca4641 --- /dev/null +++ b/obsidian-livesync/compose.yaml @@ -0,0 +1,26 @@ +obsidian-livesync: + container_name: obsidian-livesync + image: couchdb:3.3.3 + environment: + - PUID=99 + - PGID=100 + - UMASK=0022 + - 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 + 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 From f7d5f1e86e3a47977e32ee865995dfd72f1554fb Mon Sep 17 00:00:00 2001 From: komodo Date: Sun, 29 Jun 2025 13:29:56 +0800 Subject: [PATCH 11/13] [Komodo] fern: Write Compose File: update obsidian-livesync/compose.yaml --- obsidian-livesync/compose.yaml | 43 +++++++++++++++++----------------- 1 file changed, 22 insertions(+), 21 deletions(-) diff --git a/obsidian-livesync/compose.yaml b/obsidian-livesync/compose.yaml index cca4641..402f375 100644 --- a/obsidian-livesync/compose.yaml +++ b/obsidian-livesync/compose.yaml @@ -1,24 +1,25 @@ -obsidian-livesync: - container_name: obsidian-livesync - image: couchdb:3.3.3 - environment: - - PUID=99 - - PGID=100 - - UMASK=0022 - - 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 - networks: - - default - - proxy - restart: unless-stopped - labels: - caddy: obsidian-livesync.ferngarden.net - caddy.import: internal - caddy.reverse_proxy: '{{ upstreams 5984 }}' +services: + obsidian-livesync: + container_name: obsidian-livesync + image: couchdb:3.3.3 + environment: + - PUID=99 + - PGID=100 + - UMASK=0022 + - 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 + networks: + - default + - proxy + restart: unless-stopped + labels: + caddy: obsidian-livesync.ferngarden.net + caddy.import: internal + caddy.reverse_proxy: '{{ upstreams 5984 }}' networks: default: From 01a5a06c219f14055251a07483d1d97f5d4956b5 Mon Sep 17 00:00:00 2001 From: komodo Date: Sun, 29 Jun 2025 13:45:39 +0800 Subject: [PATCH 12/13] [Komodo] fern: Write Compose File: update obsidian-livesync/compose.yaml --- obsidian-livesync/compose.yaml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/obsidian-livesync/compose.yaml b/obsidian-livesync/compose.yaml index 402f375..7e9b6f5 100644 --- a/obsidian-livesync/compose.yaml +++ b/obsidian-livesync/compose.yaml @@ -1,11 +1,9 @@ services: obsidian-livesync: container_name: obsidian-livesync - image: couchdb:3.3.3 + image: couchdb:latest + user: 1000:1000 environment: - - PUID=99 - - PGID=100 - - UMASK=0022 - TZ=Australia/Perth - COUCHDB_USER=obsidian - COUCHDB_PASSWORD=${COUCHDB_PASSWORD} From d5ee6203c1563758ce69bc98f4d7e3bda87eace2 Mon Sep 17 00:00:00 2001 From: komodo Date: Sun, 29 Jun 2025 13:48:31 +0800 Subject: [PATCH 13/13] [Komodo] fern: Write Compose File: update obsidian-livesync/compose.yaml --- obsidian-livesync/compose.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/obsidian-livesync/compose.yaml b/obsidian-livesync/compose.yaml index 7e9b6f5..1abce43 100644 --- a/obsidian-livesync/compose.yaml +++ b/obsidian-livesync/compose.yaml @@ -10,6 +10,8 @@ services: 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