From edafdda1650380c86950f75692a0ae68731dea18 Mon Sep 17 00:00:00 2001
From: Cian Hughes <chughes000@gmail.com>
Date: Thu, 30 Jan 2025 17:18:52 +0000
Subject: [PATCH] Revert to 99c9c693

This reverts commit f44e67a07d355be05331f7b7a09e79237f38d08f.

Revert "Test of monolithic caddyfile"

This reverts commit a33e329cbd7ff0dada4cfabf2ed0d95851cfe728.

Revert "Added quick log fetch command to justfile"

This reverts commit 24e6305d73d729701501185cba7c96e08b21e727.

Revert "Caddy config tweak for sockets and uwsgi protocol"

This reverts commit 1e4b5bfe8d47c6260a3bbd78e749bd11ef0fca94.
---
 caddy/Caddyfile      | 73 +-------------------------------------------
 caddy/repo.caddyfile |  9 ++----
 2 files changed, 4 insertions(+), 78 deletions(-)

diff --git a/caddy/Caddyfile b/caddy/Caddyfile
index f74c6f6..d9f6cd3 100644
--- a/caddy/Caddyfile
+++ b/caddy/Caddyfile
@@ -1,4 +1,4 @@
-{
+import repo.caddyfile {
 	admin off
 	debug
 	log {
@@ -6,77 +6,6 @@
 	}
 }
 
-# Repo config
-(repo_cors) {
-	header {
-		Access-Control-Allow-Origin *
-		Access-Control-Allow-Methods "GET, POST, PUT, PATCH, DELETE, OPTIONS"
-		Access-Control-Allow-Headers "*"
-		Access-Control-Allow-Credentials true
-		Strict-Transport-Security "max-age=15768000"
-		# Request ID tracing
-		+X-Request-ID {uuid}
-	}
-}
-
-(repo_common_proxy) {
-	# Set headers similar to uwsgi_param
-	header_up Host {host}
-	header_up X-Request-ID {uuid}
-	# Remove sensitive headers
-	header_down -X-Session-ID
-	header_down -X-User-ID
-}
-
-(repo_site) {
-	import repo_cors
-
-	# UI Server routes
-	handle / {
-		request_body {
-			max_size 100MB
-		}
-		reverse_proxy / repo-web-ui:5000 {
-			transport uwsgi
-			import repo_common_proxy
-		}
-	}
-
-	# API routes
-	handle /api/* {
-		request_body {
-			max_size 100MB
-		}
-		reverse_proxy / repo-web-api:5000 {
-			transport uwsgi
-			import repo_common_proxy
-		}
-	}
-
-	# Large file upload API routes
-	handle_path /api/records/*/draft/files/*/content {
-		request_body {
-			max_size 250GB
-		}
-		encode gzip
-		reverse_proxy / repo-web-api:5000 {
-			transport uwsgi
-			import repo_common_proxy
-		}
-	}
-
-	handle /static/* {
-		root * /opt/invenio/var/instance/static
-		file_server
-	}
-
-	handle /robots.txt {
-		root * /opt/invenio/var/instance/static
-		file_server
-	}
-}
-
-# Main site config
 (site) {
 	@landing {
 		path / /contact* /about* /favicon.png
diff --git a/caddy/repo.caddyfile b/caddy/repo.caddyfile
index 67fc6f1..20a23e1 100644
--- a/caddy/repo.caddyfile
+++ b/caddy/repo.caddyfile
@@ -27,8 +27,7 @@
 		request_body {
 			max_size 100MB
 		}
-		reverse_proxy / repo-web-ui:5000 {
-			transport uwsgi
+		reverse_proxy repo-web-ui:5000 {
 			import repo_common_proxy
 		}
 	}
@@ -38,8 +37,7 @@
 		request_body {
 			max_size 100MB
 		}
-		reverse_proxy / repo-web-api:5000 {
-			transport uwsgi
+		reverse_proxy repo-web-api:5000 {
 			import repo_common_proxy
 		}
 	}
@@ -50,8 +48,7 @@
 			max_size 250GB
 		}
 		encode gzip
-		reverse_proxy / repo-web-api:5000 {
-			transport uwsgi
+		reverse_proxy repo-web-api:5000 {
 			import repo_common_proxy
 		}
 	}