Compare commits

...

3 commits

3 changed files with 24 additions and 3 deletions

View file

@ -239,7 +239,7 @@ in
chain postrouting { chain postrouting {
type nat hook postrouting priority 100; type nat hook postrouting priority 100;
ip saddr 10.0.0.0/16 ip saddr != 10.0.255.0/24 snat ip to 129.199.195.130-129.199.195.158 ip saddr 10.0.0.0/16 ip saddr != 10.0.255.0/24 snat ip to 129.199.195.130-129.199.195.158
ether saddr e0:2b:e9:b5:b4:cc snat to 129.199.195.130 comment "Elias" ether saddr { e0:2e:0b:bd:97:73, e8:d5:2b:0d:fe:4a } snat to 129.199.195.130 comment "Elias"
ether saddr { 1c:1b:b5:14:9c:e5, e6:ce:e2:b6:e3:82 } snat to 129.199.195.131 comment "Lubin" ether saddr { 1c:1b:b5:14:9c:e5, e6:ce:e2:b6:e3:82 } snat to 129.199.195.131 comment "Lubin"
ether saddr d0:49:7c:46:f6:39 snat to 129.199.195.132 comment "Jean-Marc" ether saddr d0:49:7c:46:f6:39 snat to 129.199.195.132 comment "Jean-Marc"
ether saddr { 5c:64:8e:f4:09:06 } snat to 129.199.195.158 comment "APs" ether saddr { 5c:64:8e:f4:09:06 } snat to 129.199.195.158 comment "APs"

View file

@ -131,8 +131,9 @@ let
]; ];
web02.dual = [ web02.dual = [
"cas-eleves" "cas-eleves" # CAS server
"vote" "chat" # Mattermost
"vote" # Kadenios
]; ];
web03.dual = [ web03.dual = [

View file

@ -33,6 +33,26 @@ in
_type = "static"; _type = "static";
path = ./04-crabfit-karla.patch; path = ./04-crabfit-karla.patch;
} }
# nixos/kanidm: add basic provisioning
{
id = 251598;
excludes = [ "pkgs/by-name/ka/kanidm/package.nix" ];
hash = "sha256-z4b1ljwapfj4KpXEEAMmhYKogstKtURyq+hoJcfEXiw=";
}
# kanidm-provision: 1.1.1 -> 1.1.2
{
id = 336836;
hash = "sha256-4ihpxYdLp559RIcKRC6GPt5flLCohFiPGp0k9h1s1hs=";
}
# nixos/kanidm: fix systemd service type
{
id = 337527;
excludes = [ ".git-blame-ignore-revs" ];
hash = "sha256-ca7CsPuWJqucC77ejsvoDAt+wxWLUP30IdXtZQVQrko=";
}
]; ];
"nixos-unstable" = [ "nixos-unstable" = [