From 88c39341b4d5f40c4f04cb1388920c2642501e1f Mon Sep 17 00:00:00 2001
From: Neale Pickett <neale@woozle.org>
Date: Sat, 19 Aug 2023 21:59:47 -0600
Subject: [PATCH] Version updates

---
 homelab/Caddyfile           |  1 +
 homelab/docker-compose.yaml | 76 ++++++++++++++++++-------------------
 2 files changed, 38 insertions(+), 39 deletions(-)

diff --git a/homelab/Caddyfile b/homelab/Caddyfile
index 3aa2c64..2d4d300 100644
--- a/homelab/Caddyfile
+++ b/homelab/Caddyfile
@@ -18,6 +18,7 @@ git.woozle.org {
 drive.woozle.org {
   import restricted-access
   reverse_proxy webfs:5000
+  #reverse_proxy filebrowser:80
 }
 
 media.woozle.org {
diff --git a/homelab/docker-compose.yaml b/homelab/docker-compose.yaml
index 27fe767..0a1d68f 100644
--- a/homelab/docker-compose.yaml
+++ b/homelab/docker-compose.yaml
@@ -4,6 +4,9 @@ services:
     image: coredns/coredns
     networks:
       - hostnet
+    command:
+      - -conf
+      - /Corefile
     configs:
       - source: Corefile
         target: /Corefile
@@ -93,8 +96,12 @@ services:
         source: /srv/sys/pigallery2/cache
         target: /app/data/cache
       - type: bind
-        source: /srv/media/photos
-        target: /srv/media/photos
+        source: /srv/storage/fam/Photos
+        target: /photos/fam
+        read_only: true
+      - type: bind
+        source: /srv/storage/ginnie/Photos
+        target: /photos/ginnie
         read_only: true
 
   transmission:
@@ -191,17 +198,14 @@ services:
         target: /srv/incoming
 
   gitea:
-    image: codeberg.org/forgejo/forgejo:1.18-rootless
-    secrets:
-      - source: gitea.ini
-        target: /etc/gitea/app.ini
-        uid: "1000"
-        gid: "1000"
-        mode: 0400
+    image: codeberg.org/forgejo/forgejo:1.20-rootless
     configs:
       - source: gitea-robots.txt
         target: /var/lib/gitea/custom/robots.txt
     volumes:
+      - type: bind
+        source: /srv/sys/gitea/app.ini
+        target: /etc/gitea/app.ini
       - type: bind
         source: /srv/sys/gitea
         target: /data
@@ -317,31 +321,25 @@ services:
         source: /srv/sys/ddns-updater
         target: /updater/data
 
-  tunnel:
-    deploy:
-      replicas: 0
-    image: lscr.io/linuxserver/openssh-server
-    user: abc
-    entrypoint:
-      - /usr/bin/ssh
-      - -N
-      - -R 172.17.0.1:5880:caddy:80 # 172.17.0.1 = docker host IP
-      - -R :5822:host.docker.internal:22
-      - -o ServerAliveInterval=30
-      - core@melville.woozle.org
-    extra_hosts:
-      - host.docker.internal:host-gateway
-    secrets:
-      - source: tunnel
-        target: /config/.ssh/id_rsa
-        uid: "911"
-        gid: "911"
-        mode: 0600
-      - source: known_hosts
-        target: /config/.ssh/known_hosts
-        uid: "911"
-        gid: "911"
-        mode: 0600
+  filebrowser:
+    image: filebrowser/filebrowser
+    volumes:
+      - type: bind
+        source: /srv/sys/filebrowser/database
+        target: /database
+      - type: bind
+        source: /srv/storage
+        target: /srv/storage
+      - type: bind
+        source: /srv/media
+        target: /srv/media
+      - type: bind
+        source: /srv/incoming
+        target: /srv/incoming
+    user: "911:911"
+    configs:
+      - source: filebrowser.json
+        target: /.filebrowser.json
 
 
 configs:
@@ -350,10 +348,10 @@ configs:
     name: dave.yaml-v3
   Corefile:
     file: Corefile
-    name: Corefile-v8
+    name: Corefile-v11
   Caddyfile:
     file: Caddyfile
-    name: Caddyfile-v149
+    name: Caddyfile-v153
   portal.json:
     file: portal.json
     name: portal.json-v7
@@ -366,6 +364,9 @@ configs:
   gitea-robots.txt:
     file: gitea-robots.txt
     name: gitea-robots.txt-v1
+  filebrowser.json:
+    file: filebrowser.json
+    name: filebrowser.json-v2
 
 secrets:
   passwd:
@@ -380,9 +381,6 @@ secrets:
   known_hosts:
     file: secrets/known_hosts
     name: known_hosts-v1
-  gitea.ini:
-    file: secrets/gitea.ini
-    name: gitea.ini-v4
   jwt.secret:
     file: secrets/jwt.secret
     name: jwt.secret-v1