From 9700b8a3795e3a96f67cd78e960d37b9c1f26c2d Mon Sep 17 00:00:00 2001
From: Bensuperpc <bensuperpc@gmail.com>
Date: Fri, 20 Sep 2024 21:06:41 +0200
Subject: [PATCH] Update config and add public caddy file browser

Signed-off-by: Bensuperpc <bensuperpc@gmail.com>
---
 README.md                                             |  1 +
 infrastructure/caddy/config/bensuperpc.org/Caddyfile  |  5 +++++
 infrastructure/caddy/docker-compose.caddy.yml         |  9 ++++++++-
 infrastructure/homepage/config/services.yaml          |  6 ++++++
 infrastructure/main/docker-compose.main.yml           | 10 +++++++---
 infrastructure/wordpress/docker-compose.wordpress.yml |  1 +
 6 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index bec2206..9d1d6dd 100644
--- a/README.md
+++ b/README.md
@@ -92,6 +92,7 @@ And then, caddy will generate the certificate for you and renew it automatically
 | [projectsend.bensuperpc.org](https://projectsend.bensuperpc.org) | Sub | ProjectSend for file sharing |
 | [picoshare.bensuperpc.org](https://picoshare.bensuperpc.org) | Sub | Picoshare for file sharing |
 | [dufs.bensuperpc.org](https://dufs.bensuperpc.org) | Sub | Dufs for file sharing |
+| [public.bensuperpc.org](https://public.bensuperpc.org) | Sub | Caddy for file sharing |
 | bensuperpc.com | Main | Redirect to www.bensuperpc.org |
 | bensuperpc.fr | Main | Redirect to www.bensuperpc.org |
 | bensuperpc.net | Main | Redirect to www.bensuperpc.org |
diff --git a/infrastructure/caddy/config/bensuperpc.org/Caddyfile b/infrastructure/caddy/config/bensuperpc.org/Caddyfile
index 6370bbd..bced91e 100644
--- a/infrastructure/caddy/config/bensuperpc.org/Caddyfile
+++ b/infrastructure/caddy/config/bensuperpc.org/Caddyfile
@@ -10,6 +10,11 @@ homepage.bensuperpc.org {
 	redir https://www.bensuperpc.org{uri} permanent
 }
 
+public.bensuperpc.org {
+	root * /public_data
+	file_server browse
+}
+
 wordpress.bensuperpc.org {
 	root * /var/www/html
 	php_fastcgi wordpress:9000
diff --git a/infrastructure/caddy/docker-compose.caddy.yml b/infrastructure/caddy/docker-compose.caddy.yml
index f5d888a..046326b 100644
--- a/infrastructure/caddy/docker-compose.caddy.yml
+++ b/infrastructure/caddy/docker-compose.caddy.yml
@@ -13,10 +13,12 @@ services:
       - 80:80
       - 443:443
     volumes:
-      - wordpress:/var/www/html:rw
       - caddy_data:/data:rw
       - caddy_config:/config:rw
       - ./caddy/config:/etc/caddy:ro
+      - wordpress:/var/www/html:rw
+      - public_data:/public_data:ro
+
     networks:
       - infra-network
     env_file:
@@ -46,6 +48,7 @@ services:
     cap_drop:
       - NET_ADMIN
       - NET_RAW
+      - SYS_ADMIN
 
 volumes:
   caddy_data:
@@ -54,3 +57,7 @@ volumes:
     name: caddy_config
   caddy_backup:
     name: caddy_backup
+  wordpress:
+    name: wordpress
+  public_data:
+    name: public_data
diff --git a/infrastructure/homepage/config/services.yaml b/infrastructure/homepage/config/services.yaml
index c71f0bb..c16260b 100644
--- a/infrastructure/homepage/config/services.yaml
+++ b/infrastructure/homepage/config/services.yaml
@@ -64,6 +64,12 @@
         description: Dufs
         ping: dufs.bensuperpc.org
         container: dufs
+    - caddy:
+        icon: https://cdn.jsdelivr.net/gh/walkxcode/dashboard-icons@master/png/caddy.png
+        href: https://public.bensuperpc.org/
+        description: File browser
+        ping: public.bensuperpc.org
+        container: caddy
 
 - Utils:
     - it-tools:
diff --git a/infrastructure/main/docker-compose.main.yml b/infrastructure/main/docker-compose.main.yml
index 44729ae..e6e893a 100644
--- a/infrastructure/main/docker-compose.main.yml
+++ b/infrastructure/main/docker-compose.main.yml
@@ -5,8 +5,8 @@ services:
     profiles:
       - main_infrastructure
     volumes:
-      - public_data:/public:rw
-      - private_data:/private:rw
+      - public_data:/public_data:rw
+      - private_data:/private_data:rw
     read_only: true
     security_opt:
       - no-new-privileges:true
@@ -16,7 +16,7 @@ services:
       - CHOWN
       - DAC_OVERRIDE
     # Fix root permissions on mounted volumes
-    command: chown -R ${PUID:-1000}:${PGID:-1000} /public /privates
+    command: chown -R ${PUID:-1000}:${PGID:-1000} /public_data /private_data
 
 volumes:
   public_data:
@@ -28,3 +28,7 @@ networks:
   infra-network:
     driver: bridge
     name: infra-network
+  intern-network:
+    driver: bridge
+    internal: true
+    name: intern-network
diff --git a/infrastructure/wordpress/docker-compose.wordpress.yml b/infrastructure/wordpress/docker-compose.wordpress.yml
index c50ee1e..4065fb0 100644
--- a/infrastructure/wordpress/docker-compose.wordpress.yml
+++ b/infrastructure/wordpress/docker-compose.wordpress.yml
@@ -57,6 +57,7 @@ services:
     cap_drop:
       - NET_ADMIN
       - NET_RAW
+      - SYS_ADMIN
 
 volumes:
   wordpress_db: