noe/nixos
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

remove nixpkgs master

Browse source
This commit is contained in:
41666 2024-03-23 19:02:43 -04:00
parent 69a56db22a
commit 4ec6af5aa7
7 changed files with 44 additions and 130 deletions
Download patch file Download diff file Expand all files Collapse all files

87
nixos/hosts/ingress-proxy/default.nix
View file

@ -1,5 +1,6 @@
{ lib, pkgs, config, inputs, ... }: let
tsHost = name: port: "${name}.hoki-porgy.ts.net:${toString port}";
tsHost = name: port: "${name}.hoki-porgy.ts.net:${toString port}";
flakePackage = flake: inputs.${flake}.packages.${pkgs.system}.default;
in {
imports = [
../../templates/proxmox-lxc.nix
@ -13,8 +14,8 @@ in {
system.stateVersion = "24.05";
nixpkgs.hostPlatform = "x86_64-linux";
networking.firewall.allowedTCPPorts = [ 80 443 8448 ];
networking.firewall.allowedUDPPorts = [ 80 443 8448 ];
networking.firewall.allowedTCPPorts = [ 80 443 ];
networking.firewall.allowedUDPPorts = [ 80 443 ];
services.nginx = {
recommendedTlsSettings = true;
@ -50,7 +51,7 @@ in {
};
} // defaultConfig;
mekanoesh = static { src = inputs.noe-sh.packages.${pkgs.system}.default; };
mekanoesh = static { src = flakePackage "noe-sh"; };
ps2live = upstream: {
locations."/" = {
@ -59,51 +60,6 @@ in {
};
} // defaultConfig;
in {
# Matrix (main)
# "mx.sapphic.engineer" = defaultConfig // {
# listen = [
# { addr = "0.0.0.0"; port = 443; ssl = true; }
# { addr = "[::]"; port = 443; ssl = true; }
# { addr = "0.0.0.0"; port = 8448; ssl = true; }
# { addr = "[::]"; port = 8448; ssl = true; }
# ];
# locations."/_matrix/" = {
# proxyPass = "http://mango";
# proxyWebsockets = true;
# extraConfig = ''
# proxy_set_header Host $host;
# proxy_buffering off;
# '';
# };
# extraConfig = ''
# merge_slashes off;
# client_max_body_size 100M;
# '';
# };
# "happ.ystatic.buzz" = defaultConfig // {
# locations."/" = {
# proxyPass = "http://hsb";
# proxyWebsockets = true;
# };
# extraConfig = ''
# client_max_body_size 40M;
# '';
# };
# "keysmash.xn--q9jyb4c" = defaultConfig // {
# locations."/" = {
# proxyPass = "http://ks";
# proxyWebsockets = true;
# };
# extraConfig = ''
# client_max_body_size 40M;
# '';
# };
"mekanoe.com" = mekanoesh;
"noe.sh" = mekanoesh;
@ -123,39 +79,8 @@ in {
serverAliases = [ "metagame-new.ps2.live" ];
};
"doll.repair" = static {
src = inputs.doll-repair.packages.${pkgs.system}.default;
};
"doll.repair" = static { src = flakePackage "doll-repair"; };
"porcelain.doll.repair" = placeholder;
# Generic store for /.well-known/ paths.
# "well-known.sapphic.engineer" = defaultConfig // {
# locations."=/.well-known/matrix/server" = let
# alias = pkgs.writeText "well-known-matrix-server" (builtins.toJSON {
# "m.server" = "mx.sapphic.engineer";
# });
# in {
# alias = "${alias}";
# extraConfig = ''
# default_type application/json;
# '';
# };
# locations."=/.well-known/matrix/client" = let
# alias = pkgs.writeText "well-known-matrix-client" (builtins.toJSON {
# "m.homeserver" = {
# base_url = "https://mx.sapphic.engineer";
# };
# });
# in {
# alias = "${alias}";
# extraConfig = ''
# default_type application/json;
# add_header Access-Control-Allow-Origin "*";
# '';
# };
# };
};
};