From 88ae8ae6c0f095a52b15d089587849473cf9f6df Mon Sep 17 00:00:00 2001 From: TheArcaneBrony Date: Wed, 20 Sep 2023 13:29:26 +0200 Subject: Rename container --- host/Rory-nginx/configuration.nix | 2 +- .../containers/matrix_unit_tests/container.nix | 26 ------ .../services/containers/matrix_unit_tests/root.nix | 31 ------- .../matrix_unit_tests/services/conduit.nix | 38 -------- .../matrix_unit_tests/services/nginx.nix | 101 --------------------- .../matrix_unit_tests/services/pantalaimon.nix | 17 ---- .../containers/matrixunittests/container.nix | 26 ++++++ .../services/containers/matrixunittests/root.nix | 31 +++++++ .../matrixunittests/services/conduit.nix | 38 ++++++++ .../containers/matrixunittests/services/nginx.nix | 101 +++++++++++++++++++++ .../matrixunittests/services/pantalaimon.nix | 17 ++++ 11 files changed, 214 insertions(+), 214 deletions(-) delete mode 100755 host/Rory-nginx/services/containers/matrix_unit_tests/container.nix delete mode 100755 host/Rory-nginx/services/containers/matrix_unit_tests/root.nix delete mode 100755 host/Rory-nginx/services/containers/matrix_unit_tests/services/conduit.nix delete mode 100755 host/Rory-nginx/services/containers/matrix_unit_tests/services/nginx.nix delete mode 100755 host/Rory-nginx/services/containers/matrix_unit_tests/services/pantalaimon.nix create mode 100755 host/Rory-nginx/services/containers/matrixunittests/container.nix create mode 100755 host/Rory-nginx/services/containers/matrixunittests/root.nix create mode 100755 host/Rory-nginx/services/containers/matrixunittests/services/conduit.nix create mode 100755 host/Rory-nginx/services/containers/matrixunittests/services/nginx.nix create mode 100755 host/Rory-nginx/services/containers/matrixunittests/services/pantalaimon.nix diff --git a/host/Rory-nginx/configuration.nix b/host/Rory-nginx/configuration.nix index 4663e95..28b6125 100755 --- a/host/Rory-nginx/configuration.nix +++ b/host/Rory-nginx/configuration.nix @@ -34,7 +34,7 @@ inherit pkgs lib conduit; }; - containers."matrix_unit_tests" = import ./services/containers/matrix_unit_tests/container.nix { + containers."matrixunittests" = import ./services/containers/matrixunittests/container.nix { inherit pkgs lib conduit; }; diff --git a/host/Rory-nginx/services/containers/matrix_unit_tests/container.nix b/host/Rory-nginx/services/containers/matrix_unit_tests/container.nix deleted file mode 100755 index 7c15e04..0000000 --- a/host/Rory-nginx/services/containers/matrix_unit_tests/container.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ pkgs, lib, conduit, ... }: - -{ - privateNetwork = true; - autoStart = true; - specialArgs = { - inherit conduit; - }; - config = { lib, pkgs, conduit, ... }: { - imports = [ ./root.nix ]; - environment.etc."resolv.conf".text = '' - nameserver 8.8.8.8 - nameserver 8.4.4.8 - nameserver 1.1.1.1 - nameserver 1.0.0.1 - ''; - networking.firewall = { - enable = true; - allowedTCPPorts = [ 80 ]; - }; - }; - hostAddress = "192.168.100.12"; - localAddress = "192.168.100.13"; - hostAddress6 = "fc00::3"; - localAddress6 = "fc00::4"; -} \ No newline at end of file diff --git a/host/Rory-nginx/services/containers/matrix_unit_tests/root.nix b/host/Rory-nginx/services/containers/matrix_unit_tests/root.nix deleted file mode 100755 index 6ee6f26..0000000 --- a/host/Rory-nginx/services/containers/matrix_unit_tests/root.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ config, pkgs, lib, conduit, ... }: - -{ - imports = - [ - ./services/nginx.nix - ./services/conduit.nix - ./services/pantalaimon.nix - ]; - - environment.systemPackages = with pkgs; [ - wget - neofetch - lnav - zsh - git - lsd - htop - btop - duf - kitty.terminfo - neovim - tmux - jq - yq - pv - dig - cloud-utils - ]; - system.stateVersion = "22.11"; # DO NOT EDIT! -} \ No newline at end of file diff --git a/host/Rory-nginx/services/containers/matrix_unit_tests/services/conduit.nix b/host/Rory-nginx/services/containers/matrix_unit_tests/services/conduit.nix deleted file mode 100755 index 5d41bc7..0000000 --- a/host/Rory-nginx/services/containers/matrix_unit_tests/services/conduit.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ config, pkgs, lib, conduit, ... }: - -{ - services.matrix-conduit = { - package = conduit.packages.${pkgs.system}.default; - enable = true; - settings.global = { - address = "127.0.0.1"; - server_name = "matrix_unit_tests.rory.gay"; - database_backend = "rocksdb"; - enable_lightning_bolt = true; - max_concurrent_requests = 1000; - allow_check_for_updates = false; - allow_registration = true; - disable_federation = true; - }; - }; - - systemd.services.matrix-conduit-reg-token = { - enable = true; - description = "Random registration token for Conduit."; - wantedBy = ["conduit.service"]; # So the registration can be used by Conduit. - - script = '' - rm -rfv /var/lib/matrix-conduit/* - systemctl daemon-reload - systemctl try-restart conduit.service''; - serviceConfig = { - User = "root"; - Group = "root"; - IgnoreSIGPIPE = true; - Restart = "on-failure"; - }; - }; - - system.stateVersion = "22.11"; # DO NOT EDIT! -} - diff --git a/host/Rory-nginx/services/containers/matrix_unit_tests/services/nginx.nix b/host/Rory-nginx/services/containers/matrix_unit_tests/services/nginx.nix deleted file mode 100755 index 9daaa8a..0000000 --- a/host/Rory-nginx/services/containers/matrix_unit_tests/services/nginx.nix +++ /dev/null @@ -1,101 +0,0 @@ -{ config, pkgs, lib, ... }: - -{ - services = { - nginx = { - enable = true; - package = pkgs.nginxQuic; - recommendedProxySettings = true; - recommendedTlsSettings = true; - recommendedZstdSettings = true; - recommendedGzipSettings = true; - recommendedBrotliSettings = true; - recommendedOptimisation = true; - appendConfig = '' - worker_processes 16; - ''; - eventsConfig = '' - #use kqueue; - worker_connections 512; - ''; - appendHttpConfig = '' - #sendfile on; - disable_symlinks off; - ''; - additionalModules = with pkgs.nginxModules; [ - moreheaders - ]; - virtualHosts = { - "matrix_unit_tests.rory.gay" = { - locations."/" = { - 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: *'; - # - # 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; - } - ''; - }; - 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" = "matrix_unit_tests.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"; - } - }'; - ''; - 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"; - } - ]; - } - }'; - ''; - }; - }; - }; - }; - systemd.services.nginx.serviceConfig = { - LimitNOFILE=5000000; - }; - security.acme.acceptTerms = true; - security.acme.defaults.email = "root@rory.gay"; - - system.stateVersion = "22.11"; # DO NOT EDIT! -} diff --git a/host/Rory-nginx/services/containers/matrix_unit_tests/services/pantalaimon.nix b/host/Rory-nginx/services/containers/matrix_unit_tests/services/pantalaimon.nix deleted file mode 100755 index 88b81a9..0000000 --- a/host/Rory-nginx/services/containers/matrix_unit_tests/services/pantalaimon.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ config, pkgs, lib, ... }: - -{ - services.pantalaimon-headless = { - instances."localhost" = { - homeserver = "http://localhost:6167"; - ssl = false; - extraSettings = { - "DropOldKeys" = true; - "UseKeyring" = false; - }; - }; - }; - - system.stateVersion = "22.11"; # DO NOT EDIT! -} - diff --git a/host/Rory-nginx/services/containers/matrixunittests/container.nix b/host/Rory-nginx/services/containers/matrixunittests/container.nix new file mode 100755 index 0000000..7c15e04 --- /dev/null +++ b/host/Rory-nginx/services/containers/matrixunittests/container.nix @@ -0,0 +1,26 @@ +{ pkgs, lib, conduit, ... }: + +{ + privateNetwork = true; + autoStart = true; + specialArgs = { + inherit conduit; + }; + config = { lib, pkgs, conduit, ... }: { + imports = [ ./root.nix ]; + environment.etc."resolv.conf".text = '' + nameserver 8.8.8.8 + nameserver 8.4.4.8 + nameserver 1.1.1.1 + nameserver 1.0.0.1 + ''; + networking.firewall = { + enable = true; + allowedTCPPorts = [ 80 ]; + }; + }; + hostAddress = "192.168.100.12"; + localAddress = "192.168.100.13"; + hostAddress6 = "fc00::3"; + localAddress6 = "fc00::4"; +} \ No newline at end of file diff --git a/host/Rory-nginx/services/containers/matrixunittests/root.nix b/host/Rory-nginx/services/containers/matrixunittests/root.nix new file mode 100755 index 0000000..6ee6f26 --- /dev/null +++ b/host/Rory-nginx/services/containers/matrixunittests/root.nix @@ -0,0 +1,31 @@ +{ config, pkgs, lib, conduit, ... }: + +{ + imports = + [ + ./services/nginx.nix + ./services/conduit.nix + ./services/pantalaimon.nix + ]; + + environment.systemPackages = with pkgs; [ + wget + neofetch + lnav + zsh + git + lsd + htop + btop + duf + kitty.terminfo + neovim + tmux + jq + yq + pv + dig + cloud-utils + ]; + system.stateVersion = "22.11"; # DO NOT EDIT! +} \ No newline at end of file diff --git a/host/Rory-nginx/services/containers/matrixunittests/services/conduit.nix b/host/Rory-nginx/services/containers/matrixunittests/services/conduit.nix new file mode 100755 index 0000000..5d41bc7 --- /dev/null +++ b/host/Rory-nginx/services/containers/matrixunittests/services/conduit.nix @@ -0,0 +1,38 @@ +{ config, pkgs, lib, conduit, ... }: + +{ + services.matrix-conduit = { + package = conduit.packages.${pkgs.system}.default; + enable = true; + settings.global = { + address = "127.0.0.1"; + server_name = "matrix_unit_tests.rory.gay"; + database_backend = "rocksdb"; + enable_lightning_bolt = true; + max_concurrent_requests = 1000; + allow_check_for_updates = false; + allow_registration = true; + disable_federation = true; + }; + }; + + systemd.services.matrix-conduit-reg-token = { + enable = true; + description = "Random registration token for Conduit."; + wantedBy = ["conduit.service"]; # So the registration can be used by Conduit. + + script = '' + rm -rfv /var/lib/matrix-conduit/* + systemctl daemon-reload + systemctl try-restart conduit.service''; + serviceConfig = { + User = "root"; + Group = "root"; + IgnoreSIGPIPE = true; + Restart = "on-failure"; + }; + }; + + system.stateVersion = "22.11"; # DO NOT EDIT! +} + diff --git a/host/Rory-nginx/services/containers/matrixunittests/services/nginx.nix b/host/Rory-nginx/services/containers/matrixunittests/services/nginx.nix new file mode 100755 index 0000000..9daaa8a --- /dev/null +++ b/host/Rory-nginx/services/containers/matrixunittests/services/nginx.nix @@ -0,0 +1,101 @@ +{ config, pkgs, lib, ... }: + +{ + services = { + nginx = { + enable = true; + package = pkgs.nginxQuic; + recommendedProxySettings = true; + recommendedTlsSettings = true; + recommendedZstdSettings = true; + recommendedGzipSettings = true; + recommendedBrotliSettings = true; + recommendedOptimisation = true; + appendConfig = '' + worker_processes 16; + ''; + eventsConfig = '' + #use kqueue; + worker_connections 512; + ''; + appendHttpConfig = '' + #sendfile on; + disable_symlinks off; + ''; + additionalModules = with pkgs.nginxModules; [ + moreheaders + ]; + virtualHosts = { + "matrix_unit_tests.rory.gay" = { + locations."/" = { + 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: *'; + # + # 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; + } + ''; + }; + 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" = "matrix_unit_tests.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"; + } + }'; + ''; + 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"; + } + ]; + } + }'; + ''; + }; + }; + }; + }; + systemd.services.nginx.serviceConfig = { + LimitNOFILE=5000000; + }; + security.acme.acceptTerms = true; + security.acme.defaults.email = "root@rory.gay"; + + system.stateVersion = "22.11"; # DO NOT EDIT! +} diff --git a/host/Rory-nginx/services/containers/matrixunittests/services/pantalaimon.nix b/host/Rory-nginx/services/containers/matrixunittests/services/pantalaimon.nix new file mode 100755 index 0000000..88b81a9 --- /dev/null +++ b/host/Rory-nginx/services/containers/matrixunittests/services/pantalaimon.nix @@ -0,0 +1,17 @@ +{ config, pkgs, lib, ... }: + +{ + services.pantalaimon-headless = { + instances."localhost" = { + homeserver = "http://localhost:6167"; + ssl = false; + extraSettings = { + "DropOldKeys" = true; + "UseKeyring" = false; + }; + }; + }; + + system.stateVersion = "22.11"; # DO NOT EDIT! +} + -- cgit 1.4.1