Merge branch 'master' of https://github.com/turtlebasket/michaelnet

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`:

rocktiplex/README.md

@@ -0,0 +1,4 @@
+## Notes
+
+For `storage/fathom.db`: change it to `fathom-data/fathom.db` at the next opportunity
+

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
 
@@ -82,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
@@ -93,6 +95,30 @@ services:
     networks:
       - rsf-analytics
 
+  # ============================================
+  # YTPOD
+  # ============================================
+
+  ytpod: # HTTP - port 8080
+    image: ghcr.io/turtlebasket/ytpod:latest
+    container_name: ytpod
+    restart: always
+    environment:
+      - YTPOD_URL=${YTPOD_URL}
+    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
   # ============================================

rocktiplex/example.env

@@ -1,15 +1,14 @@
-# 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://...
 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