From 5113bfdb27c5199ecf7b6f9642bfdefd46f36c98 Mon Sep 17 00:00:00 2001
From: turtlebasket <turtlebasket@gmail.com>
Date: Thu, 28 Sep 2023 22:01:10 -0700
Subject: [PATCH] rocktiplex changes

---
 rocktiplex/docker-compose.yml | 105 +++++++++++++++++++++++++++++++---
 rocktiplex/example.env        |  14 +++++
 2 files changed, 111 insertions(+), 8 deletions(-)

diff --git a/rocktiplex/docker-compose.yml b/rocktiplex/docker-compose.yml
index aa614d0..4dee8a9 100644
--- a/rocktiplex/docker-compose.yml
+++ b/rocktiplex/docker-compose.yml
@@ -1,28 +1,61 @@
 version: '3'
 
 networks:
+
   status-proxy:
     external: false
 
+  fathom:
+    external: false
+
+  rsf-analytics:
+    external: false
+
+  reader:
+    external: false
+
 services:
 
-  fathom:
+  # ============================================
+  # FATHOM ANALYTICS
+  # ============================================
+
+  fathom: # HTTP - port 8080
     image: usefathom/fathom
     container_name: fathom
-    restart: always
-    ports:
-      - "8080:8080"
+    # restart: always
     volumes:
-      - type: bind
-        source: ./fathom.db
-        target: /app/fathom.db
+      - ./storage:/storage
+      # - type: bind
+      #   source: ./fathom.db
+      #   target: /app/fathom.db
+    networks:
+      - fathom
+    environment:
+      - FATHOM_DATABASE_NAME=/storage/fathom.db
 
-  status-proxy:
+  fathom-cloudflared:
+    container_name: cloudflared-fathom
+    image: cloudflare/cloudflared
+    restart: unless-stopped
+    command: tunnel run 
+    environment:
+      - TUNNEL_TOKEN=${FATHOM_TUNNEL_TOKEN}
+    networks:
+      - fathom
+
+  # ============================================
+  # STATUS PROXY
+  # ============================================
+
+  status-proxy: # HTTP - port 8080
     image: git.michaellisano.com/mcf/status-proxy:latest
     container_name: mcf-status-proxy
     restart: always
     networks:
       - status-proxy
+    environment:
+      - ALLOWED_ORIGINS=*
 
   status-proxy-cloudflared:
     container_name: cloudflared-mcf-status-proxy
@@ -34,3 +67,59 @@ services:
     networks:
       - status-proxy
 
+  # ============================================
+  # RSF ANALYTICS
+  # ============================================
+
+  rsf-analytics: # HTTP - port 8000
+    image: ghcr.io/turtlebasket/rsf-analytics:latest
+    container_name: rsf-analytics
+    restart: always
+    networks:
+      - rsf-analytics
+    environment:
+      - API_URL=${RSF_DENSITY_API_URL}
+      - SPACE_ID=${RSF_DENSITY_SPACE_ID}
+      - API_TOKEN=${RSF_DENSITY_API_TOKEN}
+      - ADMIN_KEY=${RSF_ADMIN_KEY}
+
+  rsf-analytics-cloudflared:
+    container_name: cloudflared-rsf-analytics
+    image: cloudflare/cloudflared
+    restart: unless-stopped
+    command: tunnel run 
+    environment:
+      - TUNNEL_TOKEN=${RSF_TUNNEL_TOKEN}
+    networks:
+      - rsf-analytics
+
+  # ============================================
+  # RSS READER
+  # ============================================
+
+        #   reader-postgres:
+        #     image: postgres:9.5-alpine
+        #     restart: always
+        #     volumes:
+        #       - ~/stringer:/var/lib/postgresql/data
+        #     environment:
+        #       - POSTGRES_PASSWORD=${READER_POSTGRES_PASS}
+        #       - POSTGRES_USER=postgres
+        #       - POSTGRES_DB=stringer
+        # 
+        #   reader-web:
+        #     image: mockdeep/stringer
+        #     build: .
+        #     depends_on:
+        #       - postgres
+        #     restart: always
+        #     ports:
+        #       - 80:8080
+        #     environment:
+        #       - SECRET_KEY_BASE=${READER_SECRET_KEY_BASE}
+        #       - ENCRYPTION_PRIMARY_KEY=${READER_ENCRYPTION_PRIMARY_KEY}
+        #       - ENCRYPTION_DETERMINISTIC_KEY=${READER_ENCRYPTION_DETERMINISTIC_KEY}
+        #       - ENCRYPTION_KEY_DERIVATION_SALT=${READER_ENCRYPTION_KEY_DERIVATION_SALT}
+        #       - PORT=${READER_PORT}
+        #       - DATABASE_URL=postgres://postgres:${READER_POSTGRES_PASS}@reader-postgres:5432/stringer
+
diff --git a/rocktiplex/example.env b/rocktiplex/example.env
index 31a7cb1..f0e67d4 100644
--- a/rocktiplex/example.env
+++ b/rocktiplex/example.env
@@ -1 +1,15 @@
+# Status Proxy Cloudflared
 STATUS_PROXY_TUNNEL_TOKEN=...
+
+# Fathom Analytics Cloudflared
+FATHOM_TUNNEL_TOKEN=...
+
+# RSF Cloudflared
+RSF_TUNNEL_TOKEN=...
+
+# RSF Analytics Container
+RSF_DENSITY_API_URL=https://...
+RSF_DENSITY_SPACE_ID=spc_...
+RSF_DENSITY_API_TOKEN=shr_...
+RSF_ADMIN_KEY=abc123
+