Klub-RZ/infrastructure
4
0
Fork 0
Code Issues 7 Pull requests Projects Releases Packages Wiki Activity

core01/public-cof: flush changes, router02 → router01

Browse source
This commit is contained in:
Raito Bezarius 2022-01-24 22:04:43 +01:00
parent 2c321dd0aa
commit 067ab1d7cc
5 changed files with 27 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
machines/core-services-01/subZone.nix
View file

@ -54,24 +54,24 @@ dualstack // {
beta = {
AAAA = public-cof-ips;
subdomains = {
nuage.A = upstream-v4-proxies;
nuage.AAAA = public-cof-ips;
minecraft.AAAA = public-cof-ips;
factorio.AAAA = public-cof-ips;
home.A = upstream-v4-proxies;
home.AAAA = public-cof-ips;
pads.AAAA = public-cof-ips;
pads.subdomains = {
api.AAAA = public-cof-ips;
files.AAAA = public-cof-ips;
sandbox.AAAA = public-cof-ips;
};
docs.AAAA = public-cof-ips;
docs.A = upstream-v4-proxies;
jurisprudens = {
AAAA = public-cof-ips;
A = upstream-v4-proxies;
};
nuage.A = upstream-v4-proxies;
nuage.AAAA = public-cof-ips;
minecraft.AAAA = public-cof-ips;
factorio.AAAA = public-cof-ips;
home.A = upstream-v4-proxies;
home.AAAA = public-cof-ips;
pads.AAAA = public-cof-ips;
pads.subdomains = {
api.AAAA = public-cof-ips;
files.AAAA = public-cof-ips;
sandbox.AAAA = public-cof-ips;
};
docs.AAAA = public-cof-ips;
docs.A = upstream-v4-proxies;
jurisprudens = {
AAAA = public-cof-ips;
A = upstream-v4-proxies;
};
};
};
@ -79,7 +79,7 @@ dualstack // {
internal.subdomains = {
# Routers
router01.A = [ "10.1.1.1" ];
router02.A = [ "10.1.1.2" ];
router02.A = [ "10.1.1.1" ];
# Hypervisors
pve01 = {

2
machines/public-cof/hedgedoc.nix
View file

@ -8,7 +8,7 @@ in
configuration = {
protocolUseSSL = true;
# scp =; # TODO
domain = "//docs.beta.rz.ens.wtf";
domain = "docs.beta.rz.ens.wtf";
host = "localhost";
port = port;
db = {

4
machines/public-cof/networking.nix
View file

@ -11,9 +11,11 @@
prefixLength = 64;
}];
};
interfaces.ens19 = {
useDHCP = true;
};
firewall.allowedTCPPorts = [ 22 ];
firewall.allowedUDPPorts = [ 22 ];
firewall.enable = true;
};
}

2
machines/public-cof/nix/sources.json
View file

@ -14,7 +14,7 @@
"klubrz-nur": {
"branch": "main",
"repo": "https://git.rz.ens.wtf/Klub-RZ/nur",
"rev": "901e08a94819f07499ec6cfbea1e24808e19e4b6",
"rev": "98911e21fd58f00440dc8a5bd6568f2a349338bd",
"type": "git"
},
"niv": {

6
machines/public-cof/nur.nix
View file

@ -1,8 +1,8 @@
{ lib, pkgs, ... }:
let
nivSources = import ./nix/sources.nix;
#rz-src = nivSources.klubrz-nur;
#rz-no-pkgs = (import nivSources.klubrz-nur {});
rz-src = nivSources.klubrz-nur;
rz-no-pkgs = (import nivSources.klubrz-nur {});
in
{
nixpkgs.config.packageOverrides = {
@ -11,7 +11,7 @@ in
imports = [
"${nivSources.agenix}/modules/age.nix"
]; #++ lib.attrValues rz-no-pkgs.modules;
] ++ lib.attrValues rz-no-pkgs.modules;
nixpkgs.overlays = [];
}