Noratrieb/vps
1
0
Fork 0
mirror of https://github.com/Noratrieb/vps.git synced 2026-01-14 16:55:00 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

migrate cargo bisect rustc

Browse source
This commit is contained in:
nora 2024-08-05 20:00:30 +02:00
parent e60ecf1f91
commit fca0d6d3f4
10 changed files with 63 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

2
newinfra/nix/modules/dns/nilstrieb.dev.nix
View file

@ -42,7 +42,6 @@ let
ns2 = dns2;
# apps
bisect-rustc = vps2;
cors-school = vps2 // {
subdomains.api = vps2;
};
@ -52,6 +51,7 @@ let
localhost.A = [ (a "127.0.0.1") ];
# --- retired:
bisect-rustc = vps1;
blog = vps1;
www = vps1;
uptime = vps1;

3
newinfra/nix/modules/dns/noratrieb.dev.nix
View file

@ -41,10 +41,11 @@ let
docker = vps2;
# --- apps
uptime = vps1;
bisect-rustc = vps1;
hugo-chat = vps1 // {
subdomains.api = vps1;
};
uptime = vps1;
# --- fun shit
localhost.A = [ (a "127.0.0.1") ];

23
newinfra/nix/modules/ingress/Caddyfile
View file

@ -1,23 +1,23 @@
# https://gist.github.com/ryanburnette/d13575c9ced201e73f8169d3a793c1a3
(cors) {
@cors_preflight{args.0} method OPTIONS
@cors{args.0} header Origin {args.0}
@cors_preflight{args[0]} method OPTIONS
@cors{args[0]} header Origin {args[0]}
handle @cors_preflight{args.0} {
handle @cors_preflight{args[0]} {
header {
Access-Control-Allow-Origin "{args.0}"
Access-Control-Allow-Origin "{args[0]}"
Access-Control-Allow-Methods "GET, POST, PUT, PATCH, DELETE, OPTIONS"
Access-Control-Allow-Credentials "false"
Access-Control-Allow-Headers "${args.1}"
Access-Control-Allow-Headers "${args[1]}"
Access-Control-Max-Age "86400"
defer
}
respond "" 204
}
handle @cors{args.0} {
handle @cors{args[0]} {
header {
Access-Control-Allow-Origin "{args.0}"
Access-Control-Allow-Origin "{args[0]}"
Access-Control-Expose-Headers *
defer
}
@ -43,6 +43,10 @@ api.hugo-chat.noratrieb.dev {
reverse_proxy * localhost:5001
}
bisect-rustc.noratrieb.dev {
reverse_proxy * localhost:5005
}
################################################################
# deadname redirects
nilstrieb.dev {
@ -57,12 +61,15 @@ blog.nilstrieb.dev {
redir https://noratrieb.dev/blog{uri} permanent
}
bisect-rustc.nilstrieb.dev {
redir https://bisect-rustc.dev/blog{uri} permanent
}
hugo-chat.nilstrieb.dev {
redir https://hugo-chat.noratrieb.dev{uri} permanent
}
api.hugo-chat.nilstrieb.dev {
import cors https://hugo-chat.nilstrieb.dev "DNT,X-CustomHeader,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type"
redir https://api.hugo-chat.noratrieb.dev{uri} permanent
}

21
newinfra/nix/modules/ingress/default.nix
View file

@ -1,32 +1,37 @@
{ pkgs, config, name, website, slides, blog, ... }: {
{ pkgs, config, lib, name, website, slides, blog, ... }: {
networking.firewall.allowedTCPPorts = [
443
];
services.caddy = {
enable = true;
configFile = pkgs.writeText "Caddyfile"
(
configFile = pkgs.writeTextFile {
name = "Caddyfile";
text = (
''
{
email nilstrieb@proton.me
email nilstrieb@proton.me
}
${config.networking.hostName}.infra.noratrieb.dev {
root * ${./debugging-page}
file_server
root * ${./debugging-page}
file_server
}
${
if name == "vps1" then
builtins.readFile ./Caddyfile + ''
noratrieb.dev {
root * ${website {inherit pkgs slides blog;}}
file_server
root * ${website {inherit pkgs slides blog;}}
file_server
}
'' else ""
}
''
);
checkPhase = ''
${lib.getExe pkgs.caddy} validate --adapter=caddyfile --config=$out
'';
};
};
}