Server nginx cleanup

16 files changed, 19 insertions, 179 deletions

diff --git a/host/Rory-nginx/services/nginx/boorunav.com/root.nix b/host/Rory-nginx/services/nginx/boorunav.com/root.nix
deleted file mode 100755
index a859950..0000000
--- a/host/Rory-nginx/services/nginx/boorunav.com/root.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  root = "/data/nginx/html_boorunav";
-  enableACME = true;
-  addSSL = true;
-  locations = {
-    "/" = {
-      index = "index.html";
-    };
-  };
-}
\ No newline at end of file
diff --git a/host/Rory-nginx/services/nginx/catgirlsaresexy.com/root.nix b/host/Rory-nginx/services/nginx/catgirlsaresexy.com/root.nix
deleted file mode 100755
index e28c2e0..0000000
--- a/host/Rory-nginx/services/nginx/catgirlsaresexy.com/root.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  root = "/data/nginx/html_catgirlsaresexy";
-  enableACME = true;
-  addSSL = true;
-  locations = {
-    "/" = {
-      index = "index.html";
-    };
-  };
-}
\ No newline at end of file
diff --git a/host/Rory-nginx/services/nginx/nginx.nix b/host/Rory-nginx/services/nginx/nginx.nix
index 79a968a..0e993a1 100755
--- a/host/Rory-nginx/services/nginx/nginx.nix
+++ b/host/Rory-nginx/services/nginx/nginx.nix
@@ -1,6 +1,6 @@
 { config, pkgs, lib, ... }:
 let 
-  serveDir = config : {
+  serveDir = config: {
     enableACME = if config ? ssl then config.ssl else true;
     addSSL = if config ? ssl then config.ssl else true;
     root = if config ? path then config.path else builtins.throw "path is required";
@@ -40,28 +40,30 @@ in {
         moreheaders
       ];
       virtualHosts = {
-        "siliconheaven.thearcanebrony.net" = import ./thearcanebrony.net/siliconheaven.nix;
-        "lfs.thearcanebrony.net" = import ./thearcanebrony.net/lfs.nix;
-        "http.thearcanebrony.net" = import ./thearcanebrony.net/http.nix;
+        "boorunav.com" = serveDir { path = "/data/nginx/html_boorunav"; };
+        "catgirlsaresexy.com" = serveDir { path = "/data/nginx/html_catgirlsaresexy"; };
+        "sugarcanemc.org" = serveDir { path = "/data/nginx/html_sugarcanemc"; };
+
+        "siliconheaven.thearcanebrony.net" = serveDir { path = "/data/nginx/html_siliconheaven"; };
+        "lfs.thearcanebrony.net" = serveDir { path = "/data/nginx/html_lfs"; };
+        "git.thearcanebrony.net" = serveDir { path = "/data/nginx/html_git"; };
+        "files.thearcanebrony.net" = serveDir { path = "/data/nginx/html_files"; };
+        "spigotav.thearcanebrony.net" = serveDir { path = "/data/nginx/html_spigotav"; };
+        "terra.thearcanebrony.net" = serveDir { path = "/data/nginx/html_terrarchive"; };
+        "vives.thearcanebrony.net" = serveDir { path = "/data/nginx/html_vives"; };
+
+        "git.rory.gay" = serveDir { path = "/data/nginx/html_git"; };
+
         "thearcanebrony.net" = import ./thearcanebrony.net/root.nix;
         "sentry.thearcanebrony.net" = import ./thearcanebrony.net/sentry.nix;
-        "awooradio.thearcanebrony.net" = import ./thearcanebrony.net/awooradio.nix;
         "search.thearcanebrony.net" = import ./thearcanebrony.net/search.nix;
-        "git.thearcanebrony.net" = import ./thearcanebrony.net/git.nix;
-        "files.thearcanebrony.net" = import ./thearcanebrony.net/files.nix;
-        "spigotav.thearcanebrony.net" = import ./thearcanebrony.net/spigotav.nix;
-        "terra.thearcanebrony.net" = import ./thearcanebrony.net/terra.nix;
-        "vives.thearcanebrony.net" = import ./thearcanebrony.net/vives.nix;
+        
         "rory.gay" = import ./rory.gay/root.nix;
         #"rory.boo" = import ./rory.gay/root.nix;
-        "lfs.rory.gay" = import ./rory.gay/lfs.nix;
-        "git.rory.gay" = import ./rory.gay/git.nix;
+        "lfs.rory.gay" = serveDir { path = "/data/nginx/html_lfs"; };
+        
+        "awooradio.thearcanebrony.net" = import ./thearcanebrony.net/awooradio.nix;
         "cgit.rory.gay" = import ./rory.gay/cgit.nix;
-        #"tunnel.rory.boo" = import ./rory.boo/tunnel.nix;
-        "boorunav.com" = import ./boorunav.com/root.nix;
-        "catgirlsaresexy.com" = import ./catgirlsaresexy.com/root.nix;
-        "sugarcanemc.org" = import ./sugarcanemc.org/root.nix;
-
         #"jitsi.rory.gay" = import ./rory.gay/jitsi.nix;
 
         #matrix...
@@ -71,7 +73,6 @@ in {
         "pcpoc.rory.gay" = import ./rory.gay/pcpoc.nix;
         "matrixunittests.rory.gay" = import ./rory.gay/matrixunittests.nix;
         "conduit.matrixunittests.rory.gay" = import ./rory.gay/conduit.matrixunittests.nix;
-        "tmpthrowaway89123798.rory.gay" = import ./rory.gay/tmpthrowaway89123798.nix;
         "mru.rory.gay" = import ./rory.gay/mru.nix;
 
         #bots...
diff --git a/host/Rory-nginx/services/nginx/rory.boo/tunnel.nix b/host/Rory-nginx/services/nginx/rory.boo/tunnel.nix
deleted file mode 100755
index b50823b..0000000
--- a/host/Rory-nginx/services/nginx/rory.boo/tunnel.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  enableACME = true;
-  addSSL = true;
-  locations = {
-    "/" = {
-      proxyPass = "http://127.0.0.1:5173";
-      proxyWebsockets = true;
-      extraConfig =
-        "proxy_ssl_server_name on;" +
-        "proxy_pass_header Authorization;"
-        ;
-    };
-  };
-}
diff --git a/host/Rory-nginx/services/nginx/rory.gay/git.nix b/host/Rory-nginx/services/nginx/rory.gay/git.nix
deleted file mode 100755
index 812e946..0000000
--- a/host/Rory-nginx/services/nginx/rory.gay/git.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  root = "/data/nginx/html_git";
-  enableACME = true;
-  addSSL = true;
-  extraConfig = ''
-    autoindex on;
-    more_set_headers 'Access-Control-Allow-Origin: *';
-    more_set_headers 'Access-Control-Allow-Methods: GET, POST, OPTIONS';
-    more_set_headers 'Access-Control-Allow-Headers: DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range';
-    more_set_headers 'Access-Control-Expose-Headers: Content-Length,Content-Range';
-    more_set_headers 'Access-Control-Allow-Credentials: true';
-  '';
-}
diff --git a/host/Rory-nginx/services/nginx/rory.gay/lfs.nix b/host/Rory-nginx/services/nginx/rory.gay/lfs.nix
deleted file mode 100755
index f944eea..0000000
--- a/host/Rory-nginx/services/nginx/rory.gay/lfs.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  root = "/data/nginx/html_lfs";
-  enableACME = true;
-  addSSL = true;
-  locations = {
-    "/" = {
-      index = "index.html";
-    };
-  };
-}
\ No newline at end of file
diff --git a/host/Rory-nginx/services/nginx/rory.gay/tmpthrowaway89123798.nix b/host/Rory-nginx/services/nginx/rory.gay/tmpthrowaway89123798.nix
deleted file mode 100755
index 4d02dbe..0000000
--- a/host/Rory-nginx/services/nginx/rory.gay/tmpthrowaway89123798.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  enableACME = true;
-  addSSL = true;
-  http3 = true;
-  http3_hq = true;
-  kTLS = true;
-  extraConfig = ''
-    brotli off;
-    '';
-  locations = {
-    "/" = {
-      proxyPass = "http://192.168.100.17:80";
-    };
-  };
-}
\ No newline at end of file
diff --git a/host/Rory-nginx/services/nginx/sugarcanemc.org/root.nix b/host/Rory-nginx/services/nginx/sugarcanemc.org/root.nix
deleted file mode 100755
index 772cde1..0000000
--- a/host/Rory-nginx/services/nginx/sugarcanemc.org/root.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  root = "/data/nginx/html_sugarcanemc";
-  enableACME = true;
-  addSSL = true;
-  locations = {
-    "/" = {
-      index = "index.html";
-    };
-  };
-}
\ No newline at end of file
diff --git a/host/Rory-nginx/services/nginx/thearcanebrony.net/files.nix b/host/Rory-nginx/services/nginx/thearcanebrony.net/files.nix
deleted file mode 100755
index 45de296..0000000
--- a/host/Rory-nginx/services/nginx/thearcanebrony.net/files.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  enableACME = true;
-  addSSL = true;
-  root = "/data/nginx/html_files";
-  locations = {
-    "/" = {
-      index = "index.html";
-    };
-  };
-}
\ No newline at end of file
diff --git a/host/Rory-nginx/services/nginx/thearcanebrony.net/git.nix b/host/Rory-nginx/services/nginx/thearcanebrony.net/git.nix
deleted file mode 100755
index 3006b57..0000000
--- a/host/Rory-nginx/services/nginx/thearcanebrony.net/git.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  enableACME = true;
-  addSSL = true;
-  root = "/data/nginx/html_git";
-  locations = {
-    "/" = {
-    };
-  };
-}
\ No newline at end of file
diff --git a/host/Rory-nginx/services/nginx/thearcanebrony.net/http.nix b/host/Rory-nginx/services/nginx/thearcanebrony.net/http.nix
deleted file mode 100755
index a4184ac..0000000
--- a/host/Rory-nginx/services/nginx/thearcanebrony.net/http.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  enableACME = true;
-  addSSL = true;
-  root = "/data/nginx/html_sugarcanemc";
-  locations = {
-    "/" = {
-      index = "index.html";
-    };
-  };
-}
\ No newline at end of file
diff --git a/host/Rory-nginx/services/nginx/thearcanebrony.net/lfs.nix b/host/Rory-nginx/services/nginx/thearcanebrony.net/lfs.nix
deleted file mode 100755
index 8e7b51f..0000000
--- a/host/Rory-nginx/services/nginx/thearcanebrony.net/lfs.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  enableACME = true;
-  addSSL = true;
-  root = "/data/nginx/html_lfs";
-  locations = {
-    "/" = {
-      index = "index.html";
-    };
-  };
-}
\ No newline at end of file
diff --git a/host/Rory-nginx/services/nginx/thearcanebrony.net/siliconheaven.nix b/host/Rory-nginx/services/nginx/thearcanebrony.net/siliconheaven.nix
deleted file mode 100755
index 57af15e..0000000
--- a/host/Rory-nginx/services/nginx/thearcanebrony.net/siliconheaven.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  enableACME = true;
-  addSSL = true;
-  root = "/data/nginx/html_siliconheaven";
-  locations = {
-    "/" = {
-      index = "index.html";
-    };
-  };
-}
\ No newline at end of file
diff --git a/host/Rory-nginx/services/nginx/thearcanebrony.net/spigotav.nix b/host/Rory-nginx/services/nginx/thearcanebrony.net/spigotav.nix
deleted file mode 100755
index ef98887..0000000
--- a/host/Rory-nginx/services/nginx/thearcanebrony.net/spigotav.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  enableACME = true;
-  addSSL = true;
-  root = "/data/nginx/html_spigotav";
-  locations = {
-    "/" = {
-      index = "index.html";
-    };
-  };
-}
\ No newline at end of file
diff --git a/host/Rory-nginx/services/nginx/thearcanebrony.net/terra.nix b/host/Rory-nginx/services/nginx/thearcanebrony.net/terra.nix
deleted file mode 100755
index 58b7c14..0000000
--- a/host/Rory-nginx/services/nginx/thearcanebrony.net/terra.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  enableACME = true;
-  addSSL = true;
-  root = "/data/nginx/html_terrarchive";
-  locations = {
-    "/" = {
-      index = "index.html";
-    };
-  };
-}
\ No newline at end of file
diff --git a/host/Rory-nginx/services/nginx/thearcanebrony.net/vives.nix b/host/Rory-nginx/services/nginx/thearcanebrony.net/vives.nix
deleted file mode 100755
index 3fc280c..0000000
--- a/host/Rory-nginx/services/nginx/thearcanebrony.net/vives.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  enableACME = true;
-  addSSL = true;
-  root = "/data/nginx/html_vives";
-  locations = {
-    "/" = {
-      index = "index.html";
-    };
-  };
-}
\ No newline at end of file