Update from master 2023-09-16T01:03+00:00
This commit is contained in:
commit
c01cff70b9
@ -21,40 +21,12 @@
|
||||
|
||||
networking.hostName = "aluminium";
|
||||
|
||||
networking.iproute2.enable = true;
|
||||
networking.iproute2.rttablesExtraConfig = ''
|
||||
200 wg-clerie
|
||||
'';
|
||||
|
||||
petabyte.policyrouting = {
|
||||
services.wg-clerie = {
|
||||
enable = true;
|
||||
rules6 = [
|
||||
{ rule = "from 2a01:4f8:c0c:15f1::8106/128 lookup wg-clerie"; prio = 20000; }
|
||||
{ rule = "from 2a01:4f8:c0c:15f1::8106/128 unreachable"; prio = 20001; }
|
||||
];
|
||||
rules4 = [
|
||||
{ rule = "from 10.20.30.106/32 lookup wg-clerie"; prio = 20000; }
|
||||
{ rule = "from 10.20.30.106/32 unreachable"; prio = 20001; }
|
||||
];
|
||||
};
|
||||
|
||||
|
||||
networking.wireguard.enable = true;
|
||||
networking.wireguard.interfaces = {
|
||||
wg-clerie = {
|
||||
ips = [ "2a01:4f8:c0c:15f1::8106/128" "10.20.30.106/32" ];
|
||||
table = "wg-clerie";
|
||||
peers = [
|
||||
{
|
||||
endpoint = "vpn.clerie.de:51820";
|
||||
persistentKeepalive = 25;
|
||||
allowedIPs = [ "0.0.0.0/0" "::/0" "10.20.30.0/24" "2a01:4f8:c0c:15f1::/113" ];
|
||||
publicKey = "2p1Jqs3bkXbXHFWE6vp1yxHIFoUaZQEARS2nJzbkuBA=";
|
||||
}
|
||||
];
|
||||
ipv6s = [ "2a01:4f8:c0c:15f1::8106/128" ];
|
||||
ipv4s = [ "10.20.30.106/32" ];
|
||||
privateKeyFile = "/var/src/secrets/wireguard/wg-clerie";
|
||||
};
|
||||
};
|
||||
|
||||
clerie.monitoring = {
|
||||
enable = true;
|
||||
|
@ -10,6 +10,7 @@
|
||||
./chaosevents.nix
|
||||
./clerie.nix
|
||||
./drop.nix
|
||||
./fieldpoc.nix
|
||||
./gitea.nix
|
||||
./iot-data.nix
|
||||
./ip.nix
|
||||
@ -18,7 +19,6 @@
|
||||
./milchinsel.nix
|
||||
./mitel-ommclient2.nix
|
||||
./ping.nix
|
||||
./prediger.nix
|
||||
./public.nix
|
||||
./radicale.nix
|
||||
./reichartstrasse.nix
|
||||
|
19
hosts/web-2/fieldpoc.nix
Normal file
19
hosts/web-2/fieldpoc.nix
Normal file
@ -0,0 +1,19 @@
|
||||
{ ... }: {
|
||||
services.update-from-hydra.paths.fieldpoc = {
|
||||
enable = true;
|
||||
hydraUrl = "https://hydra.clerie.de";
|
||||
hydraProject = "clerie";
|
||||
hydraJobset = "fieldpoc";
|
||||
hydraJob = "packages.x86_64-linux.docs";
|
||||
nixStoreUri = "https://nix-cache.clerie.de";
|
||||
resultPath = "/srv/fieldpoc";
|
||||
};
|
||||
|
||||
services.nginx.virtualHosts = {
|
||||
"fieldpoc.clerie.de" = {
|
||||
enableACME = true;
|
||||
forceSSL = true;
|
||||
root = "/srv/fieldpoc";
|
||||
};
|
||||
};
|
||||
}
|
@ -1,25 +0,0 @@
|
||||
{ pkgs, ... }:
|
||||
|
||||
{
|
||||
services.nginx.virtualHosts = {
|
||||
"prediger.riese.space" = {
|
||||
enableACME = true;
|
||||
forceSSL = true;
|
||||
root = pkgs.fetchgit {
|
||||
url = "https://git.clerie.de/clerie/prediger.riese.space.git";
|
||||
rev = "7f51e884ccf8a258838adb1d825bc51eeef2f475";
|
||||
sha256 = "sha256-tL+k9l0fX4dc971y4EWGM++BvjfnvRAtU/LvS2QYANU=";
|
||||
};
|
||||
locations."/map/" = {
|
||||
alias = pkgs.fetchgit {
|
||||
url = "https://git.clerie.de/quiribi/Prediger-workadventure.git";
|
||||
rev = "304850367aad275c3410005580313dac7fe24788";
|
||||
sha256 = "sha256-t6C7k5p6ZKfQedumTqxEmGYQqgaE3OiK5q41dDWnz/Y=";
|
||||
} + "/";
|
||||
extraConfig = ''
|
||||
add_header Access-Control-Allow-Origin *;
|
||||
'';
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
Loading…
Reference in New Issue
Block a user