Clean up nginx
4 files changed, 10 insertions, 130 deletions
diff --git a/host/Rory-nginx/services/nginx/nginx.nix b/host/Rory-nginx/services/nginx/nginx.nix
index 01eaac6..0547cd5 100644
--- a/host/Rory-nginx/services/nginx/nginx.nix
+++ b/host/Rory-nginx/services/nginx/nginx.nix
@@ -38,25 +38,13 @@ in
'';
additionalModules = with pkgs.nginxModules; [ moreheaders ];
virtualHosts = {
- #"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"; };
"wad.rory.gay" = serveDir { path = "/data/nginx/html_wad"; } // {
locations."/".extraConfig = "autoindex on; try_files $uri $uri/ /index.html;";
};
"wad-api.rory.gay" = import ./rory.gay/wad-api.nix;
- "thearcanebrony.net" = import ./thearcanebrony.net/root.nix;
"sentry.thearcanebrony.net" = import ./thearcanebrony.net/sentry.nix;
"search.thearcanebrony.net" = import ./thearcanebrony.net/search.nix;
@@ -69,12 +57,9 @@ in
#matrix...
"conduit.rory.gay" = import ./rory.gay/conduit.nix;
- "matrix.rory.gay" = import ./rory.gay/matrix.nix;
"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;
- "mru.rory.gay" = import ./rory.gay/mru.nix;
- "ec.rory.gay" = import ./rory.gay/ec.nix;
#bots...
"0bottests.bots.rory.gay" = import ./rory.gay/bots.nix;
@@ -104,7 +89,7 @@ in
};
systemd.services.nginx.requires = [ "data.mount" ];
security.acme.acceptTerms = true;
- security.acme.defaults.email = "root@thearcanebrony.net";
+ security.acme.defaults.email = "root@rory.gay";
networking.hosts."127.0.0.1" = builtins.attrNames config.services.nginx.virtualHosts;
}
diff --git a/host/Rory-ovh/services/nginx/nginx.nix b/host/Rory-ovh/services/nginx/nginx.nix
index e0942d8..f0b8efd 100755
--- a/host/Rory-ovh/services/nginx/nginx.nix
+++ b/host/Rory-ovh/services/nginx/nginx.nix
@@ -42,13 +42,13 @@ in
# "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"; };
+ "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"; };
# "wad.rory.gay" = serveDir { path = "/data/nginx/html_wad"; } // {
@@ -73,29 +73,8 @@ 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;
- # "mru.rory.gay" = import ./rory.gay/mru.nix;
- # "ec.rory.gay" = import ./rory.gay/ec.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;
+ "mru.rory.gay" = import ./rory.gay/mru.nix;
+ "ec.rory.gay" = import ./rory.gay/ec.nix;
};
};
};
diff --git a/host/Rory-ovh/services/nginx/rory.gay/bots.nix b/host/Rory-ovh/services/nginx/rory.gay/bots.nix
deleted file mode 100755
index 9bd18a8..0000000
--- a/host/Rory-ovh/services/nginx/rory.gay/bots.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- enableACME = true;
- addSSL = true;
- locations = {
- "/" = {
- proxyPass = "http://127.0.0.1:5033";
- };
- };
-}
diff --git a/host/Rory-ovh/services/nginx/rory.gay/conduit.nix b/host/Rory-ovh/services/nginx/rory.gay/conduit.nix
deleted file mode 100755
index ef0fbd8..0000000
--- a/host/Rory-ovh/services/nginx/rory.gay/conduit.nix
+++ /dev/null
@@ -1,75 +0,0 @@
-{
- enableACME = true;
- addSSL = true;
- locations."/" = {
- #proxyPass = "http://127.0.0.1:9002";
- proxyPass = "http://127.0.0.1:6167";
- extraConfig = ''
- if ($request_method = 'OPTIONS') {
- more_set_headers 'Access-Control-Allow-Origin: *';
- more_set_headers 'Access-Control-Allow-Methods: *';
- #
- # Custom headers and headers various browsers *should* be OK with but aren't
- #
- more_set_headers 'Access-Control-Allow-Headers: *, Authorization';
- #
- # Tell client that this pre-flight info is valid for 20 days
- #
- more_set_headers 'Access-Control-Max-Age: 1728000';
- more_set_headers 'Content-Type: text/plain; charset=utf-8';
- more_set_headers 'Content-Length: 0';
- return 204;
- }
- # We want to wait for 15 minutes here...
- proxy_read_timeout 54000;
- proxy_connect_timeout 54000;
- proxy_send_timeout 54000;
- '';
- };
- #locations."/_synapse/client".proxyPass = "http://192.168.1.5:8008";
- locations."/_conduwuit/".extraConfig = ''
- return 404;
- '';
-
- locations."= /.well-known/matrix/server".extraConfig = ''
- more_set_headers 'Content-Type application/json';
- more_set_headers 'Access-Control-Allow-Origin *';
- return 200 '${builtins.toJSON { "m.server" = "conduit.rory.gay:443"; }}';
- '';
- locations."= /.well-known/matrix/client".extraConfig = ''
- more_set_headers 'Content-Type application/json';
- more_set_headers 'Access-Control-Allow-Origin *';
- return 200 '${
- builtins.toJSON {
- "m.homeserver".base_url = "https://conduit.rory.gay";
- "m.identity_server".base_url = "https://conduit.rory.gay";
- }
- }';
- '';
- locations."= /.well-known/matrix/support".extraConfig = ''
- more_set_headers 'Content-Type application/json';
- more_set_headers 'Access-Control-Allow-Origin *';
- return 200 '${
- builtins.toJSON {
- admins = [
- {
- matrix_id = "@emma:rory.gay";
- role = "admin";
- }
- {
- matrix_id = "@alicia:rory.gay";
- role = "admin";
- }
- {
- matrix_id = "@root:rory.gay";
- role = "admin";
- }
- {
- matrix_id = "@rory:rory.gay";
- role = "admin";
- }
- ];
- }
- }';
- '';
-}
|
