From 9c768e4891d6f9adf529231728fdfb288aae0705 Mon Sep 17 00:00:00 2001
From: Prad Nukala <prad@sonr.io>
Date: Fri, 27 Sep 2024 11:03:38 -0400
Subject: [PATCH] refactor: move configuration files to app directory

---
 Makefile                                 |  4 +--
 {config => app/config}/dwn/Config.pkl.go |  0
 {config => app/config}/dwn/Dwn.pkl.go    |  0
 {config => app/config}/dwn/IPFS.pkl.go   |  0
 {config => app/config}/dwn/Motr.pkl.go   |  0
 {config => app/config}/dwn/Schema.pkl.go |  0
 {config => app/config}/dwn/Sonr.pkl.go   |  0
 {config => app/config}/dwn/init.pkl.go   |  0
 {config => app/config}/pkl/dwn.pkl       |  2 +-
 {config => app/config}/pkl/orm.pkl       |  0
 {config => app/config}/pkl/txns.pkl      |  0
 config/caddy/Caddyfile                   | 43 ------------------------
 12 files changed, 3 insertions(+), 46 deletions(-)
 rename {config => app/config}/dwn/Config.pkl.go (100%)
 rename {config => app/config}/dwn/Dwn.pkl.go (100%)
 rename {config => app/config}/dwn/IPFS.pkl.go (100%)
 rename {config => app/config}/dwn/Motr.pkl.go (100%)
 rename {config => app/config}/dwn/Schema.pkl.go (100%)
 rename {config => app/config}/dwn/Sonr.pkl.go (100%)
 rename {config => app/config}/dwn/init.pkl.go (100%)
 rename {config => app/config}/pkl/dwn.pkl (94%)
 rename {config => app/config}/pkl/orm.pkl (100%)
 rename {config => app/config}/pkl/txns.pkl (100%)
 delete mode 100644 config/caddy/Caddyfile

diff --git a/Makefile b/Makefile
index 173b2e3f2..514762be5 100644
--- a/Makefile
+++ b/Makefile
@@ -314,8 +314,8 @@ templ:
 
 pkl:
 	@echo "(pkl) Building PKL"
-	go run github.com/apple/pkl-go/cmd/pkl-gen-go ./config/pkl/dwn.pkl
-	go run github.com/apple/pkl-go/cmd/pkl-gen-go ./config/pkl/orm.pkl
+	go run github.com/apple/pkl-go/cmd/pkl-gen-go ./app/config/pkl/dwn.pkl
+	go run github.com/apple/pkl-go/cmd/pkl-gen-go ./app/config/pkl/orm.pkl
 
 start-caddy:
 	@echo "(start-caddy) Starting caddy"
diff --git a/config/dwn/Config.pkl.go b/app/config/dwn/Config.pkl.go
similarity index 100%
rename from config/dwn/Config.pkl.go
rename to app/config/dwn/Config.pkl.go
diff --git a/config/dwn/Dwn.pkl.go b/app/config/dwn/Dwn.pkl.go
similarity index 100%
rename from config/dwn/Dwn.pkl.go
rename to app/config/dwn/Dwn.pkl.go
diff --git a/config/dwn/IPFS.pkl.go b/app/config/dwn/IPFS.pkl.go
similarity index 100%
rename from config/dwn/IPFS.pkl.go
rename to app/config/dwn/IPFS.pkl.go
diff --git a/config/dwn/Motr.pkl.go b/app/config/dwn/Motr.pkl.go
similarity index 100%
rename from config/dwn/Motr.pkl.go
rename to app/config/dwn/Motr.pkl.go
diff --git a/config/dwn/Schema.pkl.go b/app/config/dwn/Schema.pkl.go
similarity index 100%
rename from config/dwn/Schema.pkl.go
rename to app/config/dwn/Schema.pkl.go
diff --git a/config/dwn/Sonr.pkl.go b/app/config/dwn/Sonr.pkl.go
similarity index 100%
rename from config/dwn/Sonr.pkl.go
rename to app/config/dwn/Sonr.pkl.go
diff --git a/config/dwn/init.pkl.go b/app/config/dwn/init.pkl.go
similarity index 100%
rename from config/dwn/init.pkl.go
rename to app/config/dwn/init.pkl.go
diff --git a/config/pkl/dwn.pkl b/app/config/pkl/dwn.pkl
similarity index 94%
rename from config/pkl/dwn.pkl
rename to app/config/pkl/dwn.pkl
index 4eae02fbc..93f8f3a83 100644
--- a/config/pkl/dwn.pkl
+++ b/app/config/pkl/dwn.pkl
@@ -1,4 +1,4 @@
-@go.Package { name = "github.com/onsonr/sonr/config/dwn" }
+@go.Package { name = "github.com/onsonr/sonr/app/config/dwn" }
 
 module dwn
 
diff --git a/config/pkl/orm.pkl b/app/config/pkl/orm.pkl
similarity index 100%
rename from config/pkl/orm.pkl
rename to app/config/pkl/orm.pkl
diff --git a/config/pkl/txns.pkl b/app/config/pkl/txns.pkl
similarity index 100%
rename from config/pkl/txns.pkl
rename to app/config/pkl/txns.pkl
diff --git a/config/caddy/Caddyfile b/config/caddy/Caddyfile
deleted file mode 100644
index ae09792e7..000000000
--- a/config/caddy/Caddyfile
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-    # Global options
-    email team@sonr.id
-}
-
-# Services exposed via Cloudflare Tunnel
-:1323 {
-    reverse_proxy localhost:1323
-}
-
-:1317 {
-    reverse_proxy localhost:1317
-}
-
-:9090 {
-    reverse_proxy localhost:9091
-}
-
-:26657 {
-    reverse_proxy localhost:26657
-}
-
-vault.sonr.id {
-    # Since vault.sonr.id has specific configurations, we can specify the hostname
-
-    reverse_proxy localhost:8080
-
-    @vault path_regexp vaultPath ^/([a-z0-9]{42})(/.*|)$
-
-    handle @vault {
-        uri replace /{re.vaultPath.0} /ipns/{re.vaultPath.1}{re.vaultPath.2}
-        reverse_proxy localhost:8080
-    }
-
-    file_server
-
-    header {
-        Content-Type .wasm application/wasm
-        Service-Worker-Allowed "/"
-    }
-
-    encode zstd gzip
-}