From 6a35d52582c7e3c6febf8e921a88e93108f30be7 Mon Sep 17 00:00:00 2001 From: turtlebasket Date: Sun, 15 Oct 2023 23:56:30 -0700 Subject: [PATCH 1/4] add ytpod service on rocktiplex --- rocktiplex/docker-compose.yml | 28 ++++++++++++++++++++++++---- rocktiplex/example.env | 7 ++----- 2 files changed, 26 insertions(+), 9 deletions(-) diff --git a/rocktiplex/docker-compose.yml b/rocktiplex/docker-compose.yml index 4dee8a9..057f973 100644 --- a/rocktiplex/docker-compose.yml +++ b/rocktiplex/docker-compose.yml @@ -1,16 +1,14 @@ version: '3' networks: - status-proxy: external: false - fathom: external: false - rsf-analytics: external: false - + ytpod: + external: false reader: external: false @@ -93,6 +91,28 @@ services: networks: - rsf-analytics + # ============================================ + # YTPOD + # ============================================ + + ytpod: # HTTP - port 8080 + image: ghcr.io/turtlebasket/ytpod:latest + container_name: ytpod + restart: always + networks: + - ytpod + + ytpod-cloudflared: + container_name: cloudflared-ytpod + image: cloudflare/cloudflared + restart: unless-stopped + command: tunnel run + environment: + - TUNNEL_TOKEN=${YTPOD_TUNNEL_TOKEN} + networks: + - ytpod + + # ============================================ # RSS READER # ============================================ diff --git a/rocktiplex/example.env b/rocktiplex/example.env index f0e67d4..bca7c86 100644 --- a/rocktiplex/example.env +++ b/rocktiplex/example.env @@ -1,11 +1,8 @@ -# Status Proxy Cloudflared +# Cloudflared tunnel URLs STATUS_PROXY_TUNNEL_TOKEN=... - -# Fathom Analytics Cloudflared FATHOM_TUNNEL_TOKEN=... - -# RSF Cloudflared RSF_TUNNEL_TOKEN=... +YTPOD_TUNNEL_TOKEN=... # RSF Analytics Container RSF_DENSITY_API_URL=https://... From 77923ae7de668a3096afc37414b6f06080ec6907 Mon Sep 17 00:00:00 2001 From: turtlebasket Date: Mon, 16 Oct 2023 00:51:26 -0700 Subject: [PATCH 2/4] update ytpod service --- rocktiplex/docker-compose.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/rocktiplex/docker-compose.yml b/rocktiplex/docker-compose.yml index 057f973..9166c90 100644 --- a/rocktiplex/docker-compose.yml +++ b/rocktiplex/docker-compose.yml @@ -99,6 +99,8 @@ services: image: ghcr.io/turtlebasket/ytpod:latest container_name: ytpod restart: always + environment: + - YTPOD_URL=${YTPOD_URL} networks: - ytpod From f6146888920afc860748b91cd07029d2e5048e56 Mon Sep 17 00:00:00 2001 From: turtlebasket Date: Thu, 19 Oct 2023 11:14:13 -0700 Subject: [PATCH 3/4] update rsf service in rocktiplex --- rocktiplex/README.md | 4 ++++ rocktiplex/docker-compose.yml | 4 ++++ rocktiplex/example.env | 2 ++ 3 files changed, 10 insertions(+) create mode 100644 rocktiplex/README.md diff --git a/rocktiplex/README.md b/rocktiplex/README.md new file mode 100644 index 0000000..91960b5 --- /dev/null +++ b/rocktiplex/README.md @@ -0,0 +1,4 @@ +## Notes + +For `storage/fathom.db`: change it to `fathom-data/fathom.db` at the next opportunity + diff --git a/rocktiplex/docker-compose.yml b/rocktiplex/docker-compose.yml index 9166c90..a4d300e 100644 --- a/rocktiplex/docker-compose.yml +++ b/rocktiplex/docker-compose.yml @@ -80,6 +80,10 @@ services: - SPACE_ID=${RSF_DENSITY_SPACE_ID} - API_TOKEN=${RSF_DENSITY_API_TOKEN} - ADMIN_KEY=${RSF_ADMIN_KEY} + - FATHOM_HOST=${RSF_FATHOM_HOST} + - FATHOM_SITE_ID=${RSF_FATHOM_SITE_ID} + volumes: + - ./rsf-data:/app/static rsf-analytics-cloudflared: container_name: cloudflared-rsf-analytics diff --git a/rocktiplex/example.env b/rocktiplex/example.env index bca7c86..f246329 100644 --- a/rocktiplex/example.env +++ b/rocktiplex/example.env @@ -9,4 +9,6 @@ RSF_DENSITY_API_URL=https://... RSF_DENSITY_SPACE_ID=spc_... RSF_DENSITY_API_TOKEN=shr_... RSF_ADMIN_KEY=abc123 +RSF_FATHOM_HOST=analytics.example.com +RSF_FATHOM_SITE_ID=ABCDE From 34578112600587905fd1ba0b72cc88e4d860630b Mon Sep 17 00:00:00 2001 From: turtlebasket Date: Thu, 19 Oct 2023 11:14:24 -0700 Subject: [PATCH 4/4] add docker volume note --- README.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/README.md b/README.md index 813628b..b7379c8 100644 --- a/README.md +++ b/README.md @@ -27,6 +27,14 @@ Most services are run as Docker containers. +### Volume Permission Notes + +In a standard setup, we will have a `docker` usergroup. To make a *user-created directory* usable as a volume, run the following: + +```bash +sudo chown -R my-user:docker my-dir +``` + ### SELinux Notes Docker volumes violate some SELinux policies. Use `setenforce 0` to disable it temporarily, or make the following permanent change to `/etc/sysconfig/selinux`: