From d995adb4534170917b4c3dc190e4ce9db3271e0c Mon Sep 17 00:00:00 2001 From: TheArcaneBrony Date: Fri, 18 Aug 2023 03:16:47 +0200 Subject: Fix flake --- host/Rory-nginx/configuration.nix | 5 +- host/Rory-nginx/services/nginx.nix | 95 ++++++++++++++++++++++++++++++++++++ host/Rory-nginx/software.nix | 98 -------------------------------------- 3 files changed, 99 insertions(+), 99 deletions(-) create mode 100755 host/Rory-nginx/services/nginx.nix delete mode 100755 host/Rory-nginx/software.nix diff --git a/host/Rory-nginx/configuration.nix b/host/Rory-nginx/configuration.nix index 428c6e6..30eb4bb 100755 --- a/host/Rory-nginx/configuration.nix +++ b/host/Rory-nginx/configuration.nix @@ -7,7 +7,10 @@ ../../modules/users/levi.nix ../../modules/users/db2k.nix - ./software.nix + ./services/nginx.nix + ./services/postgres.nix + ./services/matrix/root.nix + ./services/nginx.nix ]; users.groups.ocp = {}; networking = { diff --git a/host/Rory-nginx/services/nginx.nix b/host/Rory-nginx/services/nginx.nix new file mode 100755 index 0000000..56b09f4 --- /dev/null +++ b/host/Rory-nginx/services/nginx.nix @@ -0,0 +1,95 @@ +{ config, pkgs, lib, ... }: + +{ + imports = + [ + ../../modules/base-server.nix + #../../modules/packages/gitfs.nix + ]; + + 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/software.nix b/host/Rory-nginx/software.nix deleted file mode 100755 index 68a629e..0000000 --- a/host/Rory-nginx/software.nix +++ /dev/null @@ -1,98 +0,0 @@ -{ config, pkgs, lib, ... }: - -{ - imports = - [ - ../../modules/base-server.nix - ./services/nginx.nix - ./services/postgres.nix - ./services/matrix/root.nix.nix - #../../modules/packages/gitfs.nix - ]; - - 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! -} -- cgit 1.4.1