switch from nginx to caddy

ansible/files/smartd.conf

@@ -19,7 +19,7 @@
 # are found.  Most users should comment out DEVICESCAN and explicitly
 # list the devices that they wish to monitor.
 #DEVICESCAN -d removable -n standby -m root -M exec /usr/share/smartmontools/smartd-runner
-DEVICESCAN -m paulsw.pw+alerts@gmail.com -M test
+DEVICESCAN -m paul@bigcavemaps.com -M test
 
 # Alternative setting to ignore temperature and power-on hours reports
 # in syslog.

ansible/files/zed.rc

@@ -15,7 +15,7 @@
 # Email will only be sent if ZED_EMAIL_ADDR is defined.
 # Disabled by default; uncomment to enable.
 #
-ZED_EMAIL_ADDR="paulsw.pw+alerts@gmail.com"
+ZED_EMAIL_ADDR="paul@bigcavemaps.com"
 
 ##
 # Name or path of executable responsible for sending notifications via email;

ansible/main.yml

@@ -226,7 +226,7 @@
       cron:
         name: 'Weekly zfs pool status check'
         special_time: weekly
-        job: '/usr/sbin/zpool status | mail -s "ZFS STATUS" paulsw.pw+alerts@gmail.com'
+        job: '/usr/sbin/zpool status | mail -s "ZFS STATUS" paul@bigcavemaps.com'
         user: root
 
     - name: Mount vtluug /media via sshfs

fogcutter/docker/caddy.sh

@@ -0,0 +1,30 @@
+#!/bin/bash
+
+set -e
+
+up () {
+  docker network create pew-net || true
+  
+  # main caddy container
+  docker run \
+    --detach \
+    --name caddy \
+    --restart unless-stopped \
+    --volume /bigdata/k8s-config/caddy/Caddyfile:/etc/caddy/Caddyfile:ro \
+    --volume /bigdata/k8s-config/caddy/data:/data:rw \
+    --publish 80:80 \
+    --publish 443:443 \
+    --network pew-net \
+    docker.io/caddy:2.6.1
+}
+
+down () {
+  docker stop caddy || true
+  docker rm caddy || true
+}
+
+logs () {
+  docker logs --follow caddy
+}
+
+$@

fogcutter/docker/firefly.sh

@@ -13,7 +13,7 @@ up () {
     --name firefly \
     --restart unless-stopped \
     --env-file firefly.env \
-    --env SITE_OWNER=paulsw.pw@gmail.com \
+    --env SITE_OWNER=paul@bigcavemaps.com \
     --env TZ=US/Eastern \
     --env TRUSTED_PROXIES=** \
     --env DB_CONNECTION=mysql \

fogcutter/docker/jellyfin.sh

@@ -1,33 +0,0 @@
-#!/bin/bash
-
-set -e
-
-up () {
-  docker network create pew-net || true
-
-  # Exposed on port 8096 in pew-net  
-  # TODO intel hw acceleration
-  docker run \
-    --detach \
-    --name jellyfin \
-    --restart unless-stopped \
-    --env PUID=1000 \
-    --env PGID=1000 \
-    --env TZ=US/Eastern \
-    --volume /bigdata/k8s-config/jellyfin/config:/config:rw \
-    --volume /bigdata/media/movies:/media/movies:ro \
-    --volume /bigdata/media/music:/media/music:ro \
-    --network pew-net \
-    ghcr.io/linuxserver/jellyfin:latest
-}
-
-down () {
-  docker stop jellyfin || true
-  docker rm jellyfin || true
-}
-
-logs () {
-  docker logs --follow jellyfin
-}
-
-$@

fogcutter/docker/minecraft.sh

@@ -1,27 +0,0 @@
-#!/bin/bash
-
-set -e
-
-up () {
-  docker run \
-    --detach \
-    --name minecraft \
-    --restart unless-stopped \
-    --env EULA=TRUE \
-    --env MAX_MEMORY=8G \
-    --env VERSION=1.18.1 \
-    --volume /bigdata/k8s-config/minecraft/1.18-data:/data:rw \
-    --publish 127.0.0.1:25565:25565 \
-    docker.io/itzg/minecraft-server:latest
-}
-
-down () {
-  docker stop minecraft || true
-  docker rm minecraft || true
-}
-
-logs () {
-  docker logs --follow minecraft
-}
-
-$@

fogcutter/docker/nginx.sh

@@ -1,42 +0,0 @@
-#!/bin/bash
-
-set -e
-
-up () {
-  docker network create pew-net || true
-  
-  # main nginx container
-  # for local access hard-code IP in /etc/hosts
-  docker run \
-    --detach \
-    --name nginx \
-    --restart unless-stopped \
-    --env PUID=1000 \
-    --env GUID=1000 \
-    --env TZ=US/Eastern \
-    --env URL=seaturtle.pw \
-    --env VALIDATION=http \
-    --env EMAIL=paulsw.pw@gmail.com \
-    --env SUBDOMAINS=cave,ff,git,jf,nc,plex \
-    --env EXTRA_DOMAINS=paul.walko.org,mp.bigcavemaps.com,tile.bigcavemaps.com \
-    --volume /bigdata/k8s-config/nginx/nginx.conf:/config/nginx/nginx.conf:ro \
-    --volume /bigdata/files:/files:ro \
-    --volume /bigdata/k8s-config/nginx/config:/config:rw \
-    --volume /bigdata/k8s-config/nginx/ssl.conf:/config/nginx/ssl.conf:ro \
-    --volume /bigdata/k8s-config/nginx/site-confs:/config/nginx/site-confs:ro \
-    --publish 80:80 \
-    --publish 443:443 \
-    --network pew-net \
-    ghcr.io/linuxserver/swag:latest
-}
-
-down () {
-  docker stop nginx || true
-  docker rm nginx || true
-}
-
-logs () {
-  docker logs --follow nginx
-}
-
-$@

fogcutter/docker/paperless.sh

@@ -1,93 +0,0 @@
-#!/bin/bash
-
-set -e
-
-up () {
-  docker network create pew-net || true
-
-  # Exposed on port 8000 in pew-net  
-  docker run \
-    --detach \
-    --name paperless \
-    --restart unless-stopped \
-    --env USERMAP_UID=1000 \
-    --env USERMAP_GID=1000 \
-    --env PAPERLESS_REDIS=redis://paperless-redis:6379 \
-    --env PAPERLESS_DBHOST=paperless-psql \
-    --env PAPERLESS_TIKA_ENABLED=1 \
-    --env PAPERLESS_TIKA_GOTENBERG_EDPOINT=http://paperless-gotenberg:3000 \
-    --env PAPERLESS_TIKA_ENDPOINT=http://paperless-tika:9998 \
-    --volume /bigdata/k8s-config/paperless/paperless/data:/usr/src/paperless/data:rw \
-    --volume /bigdata/k8s-config/paperless/paperless/media:/usr/src/paperless/media:rw \
-    --volume /bigdata/k8s-config/paperless/paperless/export:/usr/src/paperless/export:rw \
-    --volume /bigdata/k8s-config/paperless/paperless/consume:/usr/src/paperless/consume:rw \
-    --network pew-net \
-    docker.io/jonaswinkler/paperless-ng:latest
-
-  docker run \
-    --detach \
-    --name paperless-gotenberg \
-    --restart unless-stopped \
-    --env DISABLE_GOOGLE_CHROME=1 \
-    --network pew-net \
-    docker.io/thecodingmachine/gotenberg:latest
-
-  docker run \
-    --detach \
-    --name paperless-psql \
-    --env POSTGRES_DB=paperless \
-    --env POSTGRES_USER=paperless \
-    --env POSTGRES_PASSWORD=paperless \
-    --volume /bigdata/k8s-config/paperless/postgres:/var/lib/postgresql/data:rw \
-    --network pew-net \
-    docker.io/postgres:13
-
-  docker run \
-    --detach \
-    --name paperless-redis \
-    --restart unless-stopped \
-    --network pew-net \
-    docker.io/redis:6.0
-
-  docker run \
-    --detach \
-    --name paperless-tika \
-    --restart unless-stopped \
-    --network pew-net \
-    docker.io/apache/tika:latest
-}
-
-down () {
-  docker stop paperless || true
-  docker rm paperless || true
-  docker stop paperless-gotenberg || true
-  docker rm paperless-gotenberg || true
-  docker stop paperless-psql || true
-  docker rm paperless-psql || true
-  docker stop paperless-redis || true
-  docker rm paperless-redis || true
-  docker stop paperless-tika || true
-  docker rm paperless-tika || true
-}
-
-logs () {
-  docker logs --follow paperless
-}
-
-logsg () {
-  docker logs --follow paperless-gotenberg
-}
-
-logsp () {
-  docker logs --follow paperless-psql
-}
-
-logsr () {
-  docker logs --follow paperless-redis
-}
-
-logst () {
-  docker logs --follow paperless-tika
-}
-
-$@

fogcutter/docker/plex.sh

@@ -15,6 +15,7 @@ up () {
     --env VERSION=docker \
     --volume /bigdata/k8s-config/plex/config:/config:rw \
     --volume /bigdata/media/movies:/media/movies:ro \
+    --volume /bigdata/media/audiobooks:/media/audiobooks:ro \
     --volume /bigdata/media/music:/media/music:ro \
     --volume /media-vtluug:/media/media-vtluug:ro \
     --network pew-net \

fogcutter/docker/unifi.sh

@@ -1,29 +0,0 @@
-#!/bin/bash
-
-set -e
-
-up () {
-  docker run \
-    --detach \
-    --name unifi \
-    --restart unless-stopped \
-    --env PUID=1000 \
-    --env GUID=1000 \
-    --volume /bigdata/k8s-config/unifi/config:/config:rw \
-    --publish 3478:3478/udp \
-    --publish 10001:10001/udp \
-    --publish 8080:8080/tcp \
-    --publish 8443:8443/tcp \
-    ghcr.io/linuxserver/unifi-controller:6.5.54-ls134
-}
-
-down () {
-  docker stop unifi || true
-  docker rm unifi || true
-}
-
-logs () {
-  docker logs --follow unifi
-}
-
-$@