Refactor nginx
28 files changed, 89 insertions, 89 deletions
diff --git a/host/Rory-nginx/services/nginx.nix b/host/Rory-nginx/services/nginx.nix
deleted file mode 100755
index 0aa08bf..0000000
--- a/host/Rory-nginx/services/nginx.nix
+++ /dev/null
@@ -1,89 +0,0 @@
-{ config, pkgs, lib, ... }:
-
-{
- services = {
- nginx = {
- enable = true;
- package = pkgs.nginxQuic;
- recommendedProxySettings = true;
- recommendedTlsSettings = true;
- recommendedZstdSettings = true;
- recommendedGzipSettings = true;
- recommendedBrotliSettings = true;
- recommendedOptimisation = true;
- defaultMimeTypes = ../../modules/packages/nginx/mime.types;
- appendConfig = ''
- worker_processes 16;
- '';
- eventsConfig = ''
- #use kqueue;
- worker_connections 512;
- '';
- appendHttpConfig = ''
- #sendfile on;
- disable_symlinks off;
- '';
- upstreams = import ./matrix/upstreams.nix;
- additionalModules = with pkgs.nginxModules; [
- moreheaders
- ];
- virtualHosts = {
- "siliconheaven.thearcanebrony.net" = import ./hosts/thearcanebrony.net/siliconheaven.nix;
- "lfs.thearcanebrony.net" = import ./hosts/thearcanebrony.net/lfs.nix;
- "http.thearcanebrony.net" = import ./hosts/thearcanebrony.net/http.nix;
- "thearcanebrony.net" = import ./hosts/thearcanebrony.net/root.nix;
- "sentry.thearcanebrony.net" = import ./hosts/thearcanebrony.net/sentry.nix;
- "awooradio.thearcanebrony.net" = import ./hosts/thearcanebrony.net/awooradio.nix;
- "search.thearcanebrony.net" = import ./hosts/thearcanebrony.net/search.nix;
- "git.thearcanebrony.net" = import ./hosts/thearcanebrony.net/git.nix;
- "files.thearcanebrony.net" = import ./hosts/thearcanebrony.net/files.nix;
- "spigotav.thearcanebrony.net" = import ./hosts/thearcanebrony.net/spigotav.nix;
- "terra.thearcanebrony.net" = import ./hosts/thearcanebrony.net/terra.nix;
- "vives.thearcanebrony.net" = import ./hosts/thearcanebrony.net/vives.nix;
- "rory.gay" = import ./hosts/rory.gay/root.nix;
- "rory.boo" = import ./hosts/rory.gay/root.nix;
- "lfs.rory.gay" = import ./hosts/rory.gay/lfs.nix;
- "git.rory.gay" = import ./hosts/rory.gay/git.nix;
- "matrix.rory.gay" = import ./hosts/rory.gay/matrix.nix;
- "mru.rory.gay" = import ./hosts/rory.gay/mru.nix;
- "tunnel.rory.boo" = import ./hosts/rory.boo/tunnel.nix;
- "boorunav.com" = import ./hosts/boorunav.com/root.nix;
- "catgirlsaresexy.com" = import ./hosts/catgirlsaresexy.com/root.nix;
- "sugarcanemc.org" = import ./hosts/sugarcanemc.org/root.nix;
-
- #bots...
- "0bottests.bots.rory.gay" = import ./hosts/rory.gay/bots.nix;
- "catnipbot.bots.rory.gay" = import ./hosts/rory.gay/bots.nix;
- "impulsyeeter.bots.rory.gay" = import ./hosts/rory.gay/bots.nix;
- "omnibot.bots.rory.gay" = import ./hosts/rory.gay/bots.nix;
- "yatopiawatchdog.bots.rory.gay" = import ./hosts/rory.gay/bots.nix;
- "playground.bots.rory.gay" = import ./hosts/rory.gay/bots.nix;
- "kinobot.bots.rory.gay" = import ./hosts/rory.gay/bots.nix;
- "siliconbotpublic.bots.rory.gay" = import ./hosts/rory.gay/bots.nix;
- "thearcanebot.bots.rory.gay" = import ./hosts/rory.gay/bots.nix;
- "anonbot.bots.rory.gay" = import ./hosts/rory.gay/bots.nix;
- "hericanbot.bots.rory.gay" = import ./hosts/rory.gay/bots.nix;
- "siliconbot.bots.rory.gay" = import ./hosts/rory.gay/bots.nix;
- "impulsbot.bots.rory.gay" = import ./hosts/rory.gay/bots.nix;
- "studiobot.bots.rory.gay" = import ./hosts/rory.gay/bots.nix;
- "carsnbots.bots.rory.gay" = import ./hosts/rory.gay/bots.nix;
- "binsh.bots.rory.gay" = import ./hosts/rory.gay/bots.nix;
- "fosscordbot.bots.rory.gay" = import ./hosts/rory.gay/bots.nix;
- "sugarcanebot.bots.rory.gay" = import ./hosts/rory.gay/bots.nix;
- "gradbot.bots.rory.gay" = import ./hosts/rory.gay/bots.nix;
- };
- };
- };
- systemd.services.nginx.serviceConfig = {
- LimitNOFILE=5000000;
- };
- systemd.services.nginx.requires = [ "data.mount" ];
- security.acme.acceptTerms = true;
- security.acme.defaults.email = "root@thearcanebrony.net";
-
- environment.systemPackages = with pkgs; [
- #gitfs
- ];
-
- system.stateVersion = "22.11"; # DO NOT EDIT!
-}
diff --git a/host/Rory-nginx/hosts/boorunav.com/root.nix b/host/Rory-nginx/services/nginx/boorunav.com/root.nix
index a859950..a859950 100755
--- a/host/Rory-nginx/hosts/boorunav.com/root.nix
+++ b/host/Rory-nginx/services/nginx/boorunav.com/root.nix
diff --git a/host/Rory-nginx/hosts/catgirlsaresexy.com/root.nix b/host/Rory-nginx/services/nginx/catgirlsaresexy.com/root.nix
index e28c2e0..e28c2e0 100755
--- a/host/Rory-nginx/hosts/catgirlsaresexy.com/root.nix
+++ b/host/Rory-nginx/services/nginx/catgirlsaresexy.com/root.nix
diff --git a/host/Rory-nginx/matrix/upstreams-old.nix b/host/Rory-nginx/services/nginx/matrix-upstreams-workers.nix
index 3e58950..3e58950 100644
--- a/host/Rory-nginx/matrix/upstreams-old.nix
+++ b/host/Rory-nginx/services/nginx/matrix-upstreams-workers.nix
diff --git a/host/Rory-nginx/matrix/upstreams.nix b/host/Rory-nginx/services/nginx/matrix-upstreams.nix
index 6ba45af..6ba45af 100644
--- a/host/Rory-nginx/matrix/upstreams.nix
+++ b/host/Rory-nginx/services/nginx/matrix-upstreams.nix
diff --git a/host/Rory-nginx/services/nginx/nginx.nix b/host/Rory-nginx/services/nginx/nginx.nix
new file mode 100755
index 0000000..8cfcc68
--- /dev/null
+++ b/host/Rory-nginx/services/nginx/nginx.nix
@@ -0,0 +1,89 @@
+{ config, pkgs, lib, ... }:
+
+{
+ services = {
+ nginx = {
+ enable = true;
+ package = pkgs.nginxQuic;
+ recommendedProxySettings = true;
+ recommendedTlsSettings = true;
+ recommendedZstdSettings = true;
+ recommendedGzipSettings = true;
+ recommendedBrotliSettings = true;
+ recommendedOptimisation = true;
+ defaultMimeTypes = ../../modules/packages/nginx/mime.types;
+ appendConfig = ''
+ worker_processes 16;
+ '';
+ eventsConfig = ''
+ #use kqueue;
+ worker_connections 512;
+ '';
+ appendHttpConfig = ''
+ #sendfile on;
+ disable_symlinks off;
+ '';
+ upstreams = import ./matrix-upstreams.nix;
+ additionalModules = with pkgs.nginxModules; [
+ 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;
+ "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;
+ "matrix.rory.gay" = import ./rory.gay/matrix.nix;
+ "mru.rory.gay" = import ./rory.gay/mru.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;
+
+ #bots...
+ "0bottests.bots.rory.gay" = import ./rory.gay/bots.nix;
+ "catnipbot.bots.rory.gay" = import ./rory.gay/bots.nix;
+ "impulsyeeter.bots.rory.gay" = import ./rory.gay/bots.nix;
+ "omnibot.bots.rory.gay" = import ./rory.gay/bots.nix;
+ "yatopiawatchdog.bots.rory.gay" = import ./rory.gay/bots.nix;
+ "playground.bots.rory.gay" = import ./rory.gay/bots.nix;
+ "kinobot.bots.rory.gay" = import ./rory.gay/bots.nix;
+ "siliconbotpublic.bots.rory.gay" = import ./rory.gay/bots.nix;
+ "thearcanebot.bots.rory.gay" = import ./rory.gay/bots.nix;
+ "anonbot.bots.rory.gay" = import ./rory.gay/bots.nix;
+ "hericanbot.bots.rory.gay" = import ./rory.gay/bots.nix;
+ "siliconbot.bots.rory.gay" = import ./rory.gay/bots.nix;
+ "impulsbot.bots.rory.gay" = import ./rory.gay/bots.nix;
+ "studiobot.bots.rory.gay" = import ./rory.gay/bots.nix;
+ "carsnbots.bots.rory.gay" = import ./rory.gay/bots.nix;
+ "binsh.bots.rory.gay" = import ./rory.gay/bots.nix;
+ "fosscordbot.bots.rory.gay" = import ./rory.gay/bots.nix;
+ "sugarcanebot.bots.rory.gay" = import ./rory.gay/bots.nix;
+ "gradbot.bots.rory.gay" = import ./rory.gay/bots.nix;
+ };
+ };
+ };
+ systemd.services.nginx.serviceConfig = {
+ LimitNOFILE=5000000;
+ };
+ systemd.services.nginx.requires = [ "data.mount" ];
+ security.acme.acceptTerms = true;
+ security.acme.defaults.email = "root@thearcanebrony.net";
+
+ environment.systemPackages = with pkgs; [
+ #gitfs
+ ];
+
+ system.stateVersion = "22.11"; # DO NOT EDIT!
+}
diff --git a/host/Rory-nginx/hosts/rory.boo/tunnel.nix b/host/Rory-nginx/services/nginx/rory.boo/tunnel.nix
index b50823b..b50823b 100755
--- a/host/Rory-nginx/hosts/rory.boo/tunnel.nix
+++ b/host/Rory-nginx/services/nginx/rory.boo/tunnel.nix
diff --git a/host/Rory-nginx/hosts/rory.gay/bots.nix b/host/Rory-nginx/services/nginx/rory.gay/bots.nix
index f18a402..f18a402 100755
--- a/host/Rory-nginx/hosts/rory.gay/bots.nix
+++ b/host/Rory-nginx/services/nginx/rory.gay/bots.nix
diff --git a/host/Rory-nginx/hosts/rory.gay/conduit.nix b/host/Rory-nginx/services/nginx/rory.gay/conduit.nix
index 8c293d7..8c293d7 100755
--- a/host/Rory-nginx/hosts/rory.gay/conduit.nix
+++ b/host/Rory-nginx/services/nginx/rory.gay/conduit.nix
diff --git a/host/Rory-nginx/hosts/rory.gay/git.nix b/host/Rory-nginx/services/nginx/rory.gay/git.nix
index 812e946..812e946 100755
--- a/host/Rory-nginx/hosts/rory.gay/git.nix
+++ b/host/Rory-nginx/services/nginx/rory.gay/git.nix
diff --git a/host/Rory-nginx/hosts/rory.gay/lfs.nix b/host/Rory-nginx/services/nginx/rory.gay/lfs.nix
index f944eea..f944eea 100755
--- a/host/Rory-nginx/hosts/rory.gay/lfs.nix
+++ b/host/Rory-nginx/services/nginx/rory.gay/lfs.nix
diff --git a/host/Rory-nginx/hosts/rory.gay/matrix-bak.nix b/host/Rory-nginx/services/nginx/rory.gay/matrix-bak.nix
index 2780979..2780979 100755
--- a/host/Rory-nginx/hosts/rory.gay/matrix-bak.nix
+++ b/host/Rory-nginx/services/nginx/rory.gay/matrix-bak.nix
diff --git a/host/Rory-nginx/hosts/rory.gay/matrix.nix b/host/Rory-nginx/services/nginx/rory.gay/matrix.nix
index 46514a2..46514a2 100755
--- a/host/Rory-nginx/hosts/rory.gay/matrix.nix
+++ b/host/Rory-nginx/services/nginx/rory.gay/matrix.nix
diff --git a/host/Rory-nginx/hosts/rory.gay/mru.nix b/host/Rory-nginx/services/nginx/rory.gay/mru.nix
index b65bf51..b65bf51 100755
--- a/host/Rory-nginx/hosts/rory.gay/mru.nix
+++ b/host/Rory-nginx/services/nginx/rory.gay/mru.nix
diff --git a/host/Rory-nginx/hosts/rory.gay/root.nix b/host/Rory-nginx/services/nginx/rory.gay/root.nix
index be4b415..be4b415 100755
--- a/host/Rory-nginx/hosts/rory.gay/root.nix
+++ b/host/Rory-nginx/services/nginx/rory.gay/root.nix
diff --git a/host/Rory-nginx/hosts/sugarcanemc.org/root.nix b/host/Rory-nginx/services/nginx/sugarcanemc.org/root.nix
index 772cde1..772cde1 100755
--- a/host/Rory-nginx/hosts/sugarcanemc.org/root.nix
+++ b/host/Rory-nginx/services/nginx/sugarcanemc.org/root.nix
diff --git a/host/Rory-nginx/hosts/thearcanebrony.net/awooradio.nix b/host/Rory-nginx/services/nginx/thearcanebrony.net/awooradio.nix
index af52ec8..af52ec8 100755
--- a/host/Rory-nginx/hosts/thearcanebrony.net/awooradio.nix
+++ b/host/Rory-nginx/services/nginx/thearcanebrony.net/awooradio.nix
diff --git a/host/Rory-nginx/hosts/thearcanebrony.net/files.nix b/host/Rory-nginx/services/nginx/thearcanebrony.net/files.nix
index 45de296..45de296 100755
--- a/host/Rory-nginx/hosts/thearcanebrony.net/files.nix
+++ b/host/Rory-nginx/services/nginx/thearcanebrony.net/files.nix
diff --git a/host/Rory-nginx/hosts/thearcanebrony.net/git.nix b/host/Rory-nginx/services/nginx/thearcanebrony.net/git.nix
index 3006b57..3006b57 100755
--- a/host/Rory-nginx/hosts/thearcanebrony.net/git.nix
+++ b/host/Rory-nginx/services/nginx/thearcanebrony.net/git.nix
diff --git a/host/Rory-nginx/hosts/thearcanebrony.net/http.nix b/host/Rory-nginx/services/nginx/thearcanebrony.net/http.nix
index a4184ac..a4184ac 100755
--- a/host/Rory-nginx/hosts/thearcanebrony.net/http.nix
+++ b/host/Rory-nginx/services/nginx/thearcanebrony.net/http.nix
diff --git a/host/Rory-nginx/hosts/thearcanebrony.net/lfs.nix b/host/Rory-nginx/services/nginx/thearcanebrony.net/lfs.nix
index 8e7b51f..8e7b51f 100755
--- a/host/Rory-nginx/hosts/thearcanebrony.net/lfs.nix
+++ b/host/Rory-nginx/services/nginx/thearcanebrony.net/lfs.nix
diff --git a/host/Rory-nginx/hosts/thearcanebrony.net/root.nix b/host/Rory-nginx/services/nginx/thearcanebrony.net/root.nix
index bd23f10..bd23f10 100755
--- a/host/Rory-nginx/hosts/thearcanebrony.net/root.nix
+++ b/host/Rory-nginx/services/nginx/thearcanebrony.net/root.nix
diff --git a/host/Rory-nginx/hosts/thearcanebrony.net/search.nix b/host/Rory-nginx/services/nginx/thearcanebrony.net/search.nix
index 6298ba8..6298ba8 100755
--- a/host/Rory-nginx/hosts/thearcanebrony.net/search.nix
+++ b/host/Rory-nginx/services/nginx/thearcanebrony.net/search.nix
diff --git a/host/Rory-nginx/hosts/thearcanebrony.net/sentry.nix b/host/Rory-nginx/services/nginx/thearcanebrony.net/sentry.nix
index 96ffe4b..96ffe4b 100755
--- a/host/Rory-nginx/hosts/thearcanebrony.net/sentry.nix
+++ b/host/Rory-nginx/services/nginx/thearcanebrony.net/sentry.nix
diff --git a/host/Rory-nginx/hosts/thearcanebrony.net/siliconheaven.nix b/host/Rory-nginx/services/nginx/thearcanebrony.net/siliconheaven.nix
index 57af15e..57af15e 100755
--- a/host/Rory-nginx/hosts/thearcanebrony.net/siliconheaven.nix
+++ b/host/Rory-nginx/services/nginx/thearcanebrony.net/siliconheaven.nix
diff --git a/host/Rory-nginx/hosts/thearcanebrony.net/spigotav.nix b/host/Rory-nginx/services/nginx/thearcanebrony.net/spigotav.nix
index ef98887..ef98887 100755
--- a/host/Rory-nginx/hosts/thearcanebrony.net/spigotav.nix
+++ b/host/Rory-nginx/services/nginx/thearcanebrony.net/spigotav.nix
diff --git a/host/Rory-nginx/hosts/thearcanebrony.net/terra.nix b/host/Rory-nginx/services/nginx/thearcanebrony.net/terra.nix
index 58b7c14..58b7c14 100755
--- a/host/Rory-nginx/hosts/thearcanebrony.net/terra.nix
+++ b/host/Rory-nginx/services/nginx/thearcanebrony.net/terra.nix
diff --git a/host/Rory-nginx/hosts/thearcanebrony.net/vives.nix b/host/Rory-nginx/services/nginx/thearcanebrony.net/vives.nix
index 3fc280c..3fc280c 100755
--- a/host/Rory-nginx/hosts/thearcanebrony.net/vives.nix
+++ b/host/Rory-nginx/services/nginx/thearcanebrony.net/vives.nix
|
