From d51d142877582ff4f5d38ffa6550c483cbf0d658 Mon Sep 17 00:00:00 2001
From: Paul Walko <paul@walko.org>
Date: Sun, 7 Mar 2021 20:21:54 -0500
Subject: [PATCH] add cave

---
 fogcutter/podman/firefly.sh |  2 +-
 fogcutter/podman/matrix.sh  | 52 -------------------------------------
 fogcutter/podman/nginx.sh   |  3 ++-
 3 files changed, 3 insertions(+), 54 deletions(-)
 delete mode 100755 fogcutter/podman/matrix.sh

diff --git a/fogcutter/podman/firefly.sh b/fogcutter/podman/firefly.sh
index 1f61488..172cdfb 100755
--- a/fogcutter/podman/firefly.sh
+++ b/fogcutter/podman/firefly.sh
@@ -11,7 +11,7 @@ up () {
   # Create firefly.env with APP_KEY
   podman create \
     --name firefly \
-    --env-file=firefly.env \
+    --env-file firefly.env \
     --env SITE_OWNER=paulsw.pw@gmail.com \
     --env TZ=US/Eastern \
     --env TRUSTED_PROXIES=** \
diff --git a/fogcutter/podman/matrix.sh b/fogcutter/podman/matrix.sh
deleted file mode 100755
index 4a29238..0000000
--- a/fogcutter/podman/matrix.sh
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/bin/bash
-
-set -e
-
-up () {
-  loginctl enable-linger $USER
-  podman network create pew-net || true
-
-  # Exposed on port 8008 in pew-net
-  podman create \
-    --name synapse \
-    --env TZ=US/Eastern \
-    --volume /bigdata/k8s-config/matrix/synapse:/data:rw \
-    --network pew-net \
-    matrixdotorg/synapse:v1.26.0
-
-  podman generate systemd synapse --restart-policy=always --name > $HOME/.config/systemd/user/synapse.service
-  systemctl --user daemon-reload
-  systemctl start --user synapse || systemctl restart --user synapse
-  systemctl enable --user synapse
-
-  # Exposed on port 80 in pew-net
-  podman create \
-    --name riot-web \
-    --volume /bigdata/k8s-config/matrix/riot-web/config.json:/app/config.json:ro \
-    --network pew-net \
-    vectorim/element-web:v1.7.20
-
-  podman generate systemd riot-web --restart-policy=always --name > $HOME/.config/systemd/user/riot-web.service
-  systemctl --user daemon-reload
-  systemctl start --user riot-web || systemctl restart --user riot-web
-  systemctl enable --user riot-web
-}
-
-down () {
-  systemctl stop --user synapse || true
-  systemctl disable --user synapse || true
-  podman rm synapse || true
-  systemctl stop --user riot-web || true
-  systemctl disable --user riot-web || true
-  podman rm riot-web || true
-}
-
-logs () {
-  podman logs -f synapse
-}
-
-logsr () {
-  podman logs -f riot-web
-}
-
-$@
diff --git a/fogcutter/podman/nginx.sh b/fogcutter/podman/nginx.sh
index 146555d..1151e62 100755
--- a/fogcutter/podman/nginx.sh
+++ b/fogcutter/podman/nginx.sh
@@ -14,7 +14,7 @@ up () {
     --env GUID=1000 \
     --env TZ=US/Eastern \
     --env URL=seaturtle.pw \
-    --env SUBDOMAINS=airsonic,ff,git,jf,m,matrix,nc,plex \
+    --env SUBDOMAINS=airsonic,cave,ff,git,jf,nc,plex \
     --env VALIDATION=http \
     --env EMAIL=paulsw.pw@gmail.com \
     --volume /bigdata/files:/files:ro \
@@ -22,6 +22,7 @@ up () {
     --volume /bigdata/k8s-config/nginx/nginx.conf:/config/nginx/nginx.conf:ro \
     --volume /bigdata/k8s-config/nginx/ssl.conf:/config/nginx/ssl.conf:ro \
     --volume /bigdata/k8s-config/nginx/site-confs:/config/nginx/site-confs:ro \
+    --volume /bigdata/archive/cavepedia:/cavepedia:ro \
     --publish 127.0.0.1:80:80 \
     --publish 443:443 \
     --publish 8448:8448 \