From 967158c17212f10a803c07c5e8e8587a07286b5f Mon Sep 17 00:00:00 2001 From: TheArcaneBrony Date: Wed, 20 Sep 2023 13:39:31 +0200 Subject: Fix host nginx --- .../containers/matrixunittests/services/conduit.nix | 2 +- .../containers/matrixunittests/services/nginx.nix | 6 +++--- host/Rory-nginx/services/nginx/nginx.nix | 2 +- .../services/nginx/rory.gay/matrix_unit_tests.nix | 15 --------------- .../services/nginx/rory.gay/matrixunittests.nix | 15 +++++++++++++++ 5 files changed, 20 insertions(+), 20 deletions(-) delete mode 100755 host/Rory-nginx/services/nginx/rory.gay/matrix_unit_tests.nix create mode 100755 host/Rory-nginx/services/nginx/rory.gay/matrixunittests.nix (limited to 'host') diff --git a/host/Rory-nginx/services/containers/matrixunittests/services/conduit.nix b/host/Rory-nginx/services/containers/matrixunittests/services/conduit.nix index 5d41bc7..e4835d8 100755 --- a/host/Rory-nginx/services/containers/matrixunittests/services/conduit.nix +++ b/host/Rory-nginx/services/containers/matrixunittests/services/conduit.nix @@ -6,7 +6,7 @@ enable = true; settings.global = { address = "127.0.0.1"; - server_name = "matrix_unit_tests.rory.gay"; + server_name = "matrixunittestss.rory.gay"; database_backend = "rocksdb"; enable_lightning_bolt = true; max_concurrent_requests = 1000; diff --git a/host/Rory-nginx/services/containers/matrixunittests/services/nginx.nix b/host/Rory-nginx/services/containers/matrixunittests/services/nginx.nix index 9daaa8a..1fd0e8a 100755 --- a/host/Rory-nginx/services/containers/matrixunittests/services/nginx.nix +++ b/host/Rory-nginx/services/containers/matrixunittests/services/nginx.nix @@ -26,7 +26,7 @@ moreheaders ]; virtualHosts = { - "matrix_unit_tests.rory.gay" = { + "matrixunittests.rory.gay" = { locations."/" = { proxyPass = "http://127.0.0.1:6167"; extraConfig = '' @@ -51,14 +51,14 @@ more_set_headers 'Content-Type application/json'; more_set_headers 'Access-Control-Allow-Origin *'; return 200 '${builtins.toJSON { - "m.server" = "matrix_unit_tests.rory.gay:443"; + "m.server" = "matrixunittestss.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://matrix_unit_tests.rory.gay"; + "m.homeserver".base_url = "https://matrixunittestss.rory.gay"; } }'; ''; diff --git a/host/Rory-nginx/services/nginx/nginx.nix b/host/Rory-nginx/services/nginx/nginx.nix index 87999f1..ac1f29b 100755 --- a/host/Rory-nginx/services/nginx/nginx.nix +++ b/host/Rory-nginx/services/nginx/nginx.nix @@ -53,7 +53,7 @@ "conduit.rory.gay" = import ./rory.gay/conduit.nix; "matrix.rory.gay" = import ./rory.gay/matrix.nix; "pcpoc.rory.gay" = import ./rory.gay/pcpoc.nix; - "matrix_unit_tests.rory.gay" = import ./rory.gay/matrix_unit_tests.nix; + "matrixunittests.rory.gay" = import ./rory.gay/matrixunittests.nix; "mru.rory.gay" = import ./rory.gay/mru.nix; #bots... diff --git a/host/Rory-nginx/services/nginx/rory.gay/matrix_unit_tests.nix b/host/Rory-nginx/services/nginx/rory.gay/matrix_unit_tests.nix deleted file mode 100755 index 65a2c6c..0000000 --- a/host/Rory-nginx/services/nginx/rory.gay/matrix_unit_tests.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.13:80"; - }; - }; -} \ No newline at end of file diff --git a/host/Rory-nginx/services/nginx/rory.gay/matrixunittests.nix b/host/Rory-nginx/services/nginx/rory.gay/matrixunittests.nix new file mode 100755 index 0000000..65a2c6c --- /dev/null +++ b/host/Rory-nginx/services/nginx/rory.gay/matrixunittests.nix @@ -0,0 +1,15 @@ +{ + enableACME = true; + addSSL = true; + http3 = true; + http3_hq = true; + kTLS = true; + extraConfig = '' + brotli off; + ''; + locations = { + "/" = { + proxyPass = "http://192.168.100.13:80"; + }; + }; +} \ No newline at end of file -- cgit 1.4.1