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

noratrieb.dev work

Browse source
This commit is contained in:
nora 2024-08-02 17:36:55 +02:00
parent e2a0659d8b
commit a7aea77480
8 changed files with 26 additions and 113 deletions
Download patch file Download diff file Expand all files Collapse all files

10
newinfra/nix/deploy/smoke-tests.sh
View file

@ -8,8 +8,12 @@ set -eux
dig @dns1.infra.noratrieb.dev dns1.infra.noratrieb.dev +noall +answer | grep 154.38.163.74 dig @dns1.infra.noratrieb.dev dns1.infra.noratrieb.dev +noall +answer | grep 154.38.163.74
dig @dns2.infra.noratrieb.dev dns1.infra.noratrieb.dev +noall +answer | grep 154.38.163.74 dig @dns2.infra.noratrieb.dev dns1.infra.noratrieb.dev +noall +answer | grep 154.38.163.74
dig @dns1.infra.noratrieb.dev nilstrieb.dev +noall +answer | grep 185.199.108.153 dig @dns1.infra.noratrieb.dev nilstrieb.dev +noall +answer | grep 161.97.165.1
dig @dns2.infra.noratrieb.dev nilstrieb.dev +noall +answer | grep 185.199.108.153 dig @dns2.infra.noratrieb.dev nilstrieb.dev +noall +answer | grep 161.97.165.1
# Check HTTP responses # Check HTTP responses
curl --fail https://vps1.infra.noratrieb.dev curl --fail -s https://vps1.infra.noratrieb.dev -o /dev/null
curl --fail -s https://vps3.infra.noratrieb.dev -o /dev/null
curl --fail -s https://vps4.infra.noratrieb.dev -o /dev/null
curl --fail -s https://vps5.infra.noratrieb.dev -o /dev/null
curl --fail -s https://noratrieb.dev -o /dev/null

4
newinfra/nix/hive.nix
View file

@ -8,6 +8,10 @@
nixpkgs = import (fetchTarball "https://github.com/NixOS/nixpkgs/archive/a1cc729dcbc31d9b0d11d86dc7436163548a9665.tar.gz"); # nixos-24.05 2024-07-26 nixpkgs = import (fetchTarball "https://github.com/NixOS/nixpkgs/archive/a1cc729dcbc31d9b0d11d86dc7436163548a9665.tar.gz"); # nixos-24.05 2024-07-26
specialArgs = { specialArgs = {
website = import (fetchTarball "https://github.com/Noratrieb/website/archive/8751a926d108288c370414ee6add78cb9058c29a.tar.gz");
blog = fetchTarball "https://github.com/Noratrieb/nilstrieb.github.io/archive/d2e858ddca7e59c9d9c843f7273ff0f75d65421e.tar.gz";
slides = fetchTarball "https://github.com/Noratrieb/slides/archive/0401f35c22b124b69447655f0c537badae9e223c.tar.gz";
networkingConfig = { networkingConfig = {
dns1 = { dns1 = {
publicIPv4 = "154.38.163.74"; publicIPv4 = "154.38.163.74";

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

@ -14,7 +14,8 @@ let
}; };
in in
with hostsToDns; with hostsToDns;
{ # point nilstrieb.dev to vps1
vps1 // {
SOA = { SOA = {
nameServer = "ns1.nilstrieb.dev"; nameServer = "ns1.nilstrieb.dev";
adminEmail = "void@noratrieb.dev"; adminEmail = "void@noratrieb.dev";
@ -31,21 +32,6 @@ let
"ns2.nilstrieb.dev" "ns2.nilstrieb.dev"
]; ];
A = map (ttl hour1) [
# GH Pages
(a "185.199.108.153")
(a "185.199.109.153")
(a "185.199.110.153")
(a "185.199.111.153")
];
AAAA = map (ttl hour1) [
# GH Pages
(aaaa "2606:50c0:8002:0:0:0:0:153")
(aaaa "2606:50c0:8003:0:0:0:0:153")
(aaaa "2606:50c0:8000:0:0:0:0:153")
(aaaa "2606:50c0:8001:0:0:0:0:153")
];
MX = with mx; [ MX = with mx; [
(mx 10 "mail.protonmail.ch") (mx 10 "mail.protonmail.ch")
(mx 20 "mailsec.protonmail.ch") (mx 20 "mailsec.protonmail.ch")
@ -56,7 +42,7 @@ let
ns2 = dns2; ns2 = dns2;
www = vps2; www = vps2;
blog.CNAME = map (ttl hour1) [ (cname "nilstrieb.github.io") ]; blog = vps1;
# apps # apps
bisect-rustc = vps2; bisect-rustc = vps2;

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

@ -28,6 +28,8 @@ let
ns1 = dns1; ns1 = dns1;
ns2 = dns2; ns2 = dns2;
blog.CNAME = map (ttl hour1) [ (cname "noratrieb.github.io") ];
www.CNAME = [ (cname "noratrieb.dev") ]; www.CNAME = [ (cname "noratrieb.dev") ];
pronouns.TXT = [ pronouns.TXT = [
"she/her" "she/her"

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

@ -1,4 +1,4 @@
{ pkgs, config, name, ... }: { { pkgs, config, name, website, slides, blog, ... }: {
networking.firewall.allowedTCPPorts = [ networking.firewall.allowedTCPPorts = [
443 443
]; ];
@ -17,8 +17,16 @@
${ ${
if name == "vps1" then if name == "vps1" then
'' ''
nilstrieb.dev {
redir https://noratrieb.dev{uri} permanent
}
blog.nilstrieb.dev {
redir https://blog.noratrieb.dev{uri} permanent
}
noratrieb.dev { noratrieb.dev {
root * ${./nora} root * ${website {inherit pkgs slides blog;}}
file_server file_server
} }
'' else "" '' else ""

21
newinfra/nix/modules/ingress/nora/index.html
View file

@ -1,21 +0,0 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>nora</title>
<link rel="stylesheet" href="theme.css" />
</head>
<body class="overflow-hidden">
<div class="main-content">
<div class="main-content-inner">
<h1>nora's website</h1>
<div>
<p>hey, I'm nora (she/her?)! i think. maybe. who knows, really</p>
<p>this is here because i still havent managed move over <a href="https://nilstrieb.dev">nilstrieb.dev</a>, lol.</p>
<img width="100%" src="nora.png">
</div>
</div>
</div>
</body>
</html>

BIN
newinfra/nix/modules/ingress/nora/nora.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 58 KiB

70
newinfra/nix/modules/ingress/nora/theme.css
View file

@ -1,70 +0,0 @@
body {
font-family: Verdana, sans-serif;
background-color: #e6dae9;
color: #1b191c;
}
.main-content {
display: flex;
flex-direction: column;
align-items: center;
}
@media (min-width: 700px) {
.main-content-inner {
width: 70vw;
}
}
@media (min-width: 1200px) {
.main-content-inner {
width: 50vw;
}
}
.call-to-action {
width: 250px;
height: 50px;
background-color: #8c499d;
display: flex;
justify-content: center;
align-items: center;
cursor: pointer;
text-decoration: none;
}
@media (min-width: 1000px) {
.call-to-action {
width: 400px;
}
}
.call-to-action:hover {
background-color: #ac78b8;
}
.call-to-action * {
color: white;
}
@media (prefers-color-scheme: light) {
body {
background-color: #e6dae9;
color: #1b191c;
}
.secret {
color: #5b4561;
}
}
@media (prefers-color-scheme: dark) {
body {
background-color: #1b191c;
color: #e6dae9;
}
.secret {
color: #a081a9;
}
}