Changes to the Fudo zone.
This commit is contained in:
parent
7ca840d86f
commit
8487dd6484
14
flake.lock
generated
14
flake.lock
generated
@ -2,11 +2,11 @@
|
||||
"nodes": {
|
||||
"fudo-lib": {
|
||||
"locked": {
|
||||
"lastModified": 1641514305,
|
||||
"narHash": "sha256-w9/y+wrOG5JrgPPJwXhaG0ZCd5sbSn41pnJZsdYBI/A=",
|
||||
"lastModified": 1641534571,
|
||||
"narHash": "sha256-bpG/2dXycwYPO/klYI1ceUZ3rtc9jud1ZAPxmTdWtRY=",
|
||||
"ref": "master",
|
||||
"rev": "9adef243c8bef9e3f9c0f5051c74d5ad388ac40c",
|
||||
"revCount": 57,
|
||||
"rev": "ffbe3656ecac280fed64029cb92535cef6c12308",
|
||||
"revCount": 58,
|
||||
"type": "git",
|
||||
"url": "https://git.fudo.org/fudo-nix/lib.git"
|
||||
},
|
||||
@ -17,11 +17,11 @@
|
||||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1641463613,
|
||||
"narHash": "sha256-xZN9igqdZvnhSeTx8OlGby/OaYQHwgXVrBrPW0gLEh8=",
|
||||
"lastModified": 1641521701,
|
||||
"narHash": "sha256-IuW+4EqqKjNdJ4yO0Qr8k63OkyV1TaF5vsrZzU3GCfI=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "77fda7f672726e1a95c8cd200f27bccfc86c870b",
|
||||
"rev": "d77bbfcbb650d9c219ca3286e1efb707b922d7c2",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
||||
@ -5,83 +5,38 @@
|
||||
imap = "mail.fudo.org.";
|
||||
webmail = "france.fudo.org.";
|
||||
|
||||
archiva = "france.fudo.org.";
|
||||
auth = "france.fudo.org.";
|
||||
backplane = "france.fudo.org.";
|
||||
chat = "france.fudo.org.";
|
||||
# archiva = "france.fudo.org.";
|
||||
auth = "nutboy3.fudo.org.";
|
||||
backplane = "nutboy3.fudo.org.";
|
||||
chat = "nutboy3.fudo.org.";
|
||||
de = "germany.fudo.org.";
|
||||
fr = "france.fudo.org.";
|
||||
git = "france.fudo.org.";
|
||||
metrics = "france.fudo.org.";
|
||||
minecraft = "france.fudo.org.";
|
||||
monitor = "france.fudo.org.";
|
||||
niten = "user.fudo.org";
|
||||
reaper = "user.fudo.org";
|
||||
src = "git.fudo.org";
|
||||
user = "paris.fudo.org.";
|
||||
u = "user.fudo.org.";
|
||||
u = "paris.fudo.org.";
|
||||
w = "www.fudo.org.";
|
||||
ww = "www.fudo.org.";
|
||||
www = "hanover.fudo.org.";
|
||||
wiki = "hanover.fudo.org.";
|
||||
|
||||
whm1 = "whm1.100percenthost.net.";
|
||||
whm2 = "whm2.100percenthost.net.";
|
||||
whm3 = "whm3.100percenthost.net.";
|
||||
whm4 = "whm4.100percenthost.net.";
|
||||
};
|
||||
|
||||
# mx = [ "mail.fudo.org" ];
|
||||
|
||||
# verbatim-dns-records = [
|
||||
# ''@ IN TXT "v=spf1 mx ip4:208.81.3.112/28 ip6:2605:e200:d200::1/48 -all"''
|
||||
# ''@ IN SPF "v=spf1 mx ip4:208.81.3.112/28 ip6:2605:e200:d200::1/48 -all"''
|
||||
# ];
|
||||
|
||||
srv-records = {
|
||||
tcp = {
|
||||
# domain = [
|
||||
# {
|
||||
# host = "ns1.fudo.org";
|
||||
# port = 53;
|
||||
# }
|
||||
# {
|
||||
# host = "ns2.fudo.org";
|
||||
# port = 53;
|
||||
# }
|
||||
# {
|
||||
# host = "ns3.fudo.org";
|
||||
# port = 53;
|
||||
# }
|
||||
# {
|
||||
# host = "ns4.fudo.org";
|
||||
# port = 53;
|
||||
# }
|
||||
# ];
|
||||
ssh = [{
|
||||
host = "france.fudo.org";
|
||||
port = 22;
|
||||
}];
|
||||
# smtp = [{
|
||||
# host = "mail.fudo.org";
|
||||
# port = 25;
|
||||
# }];
|
||||
# submission = [{
|
||||
# host = "mail.fudo.org";
|
||||
# port = 587;
|
||||
# }];
|
||||
# kerberos = [{
|
||||
# host = "france.fudo.org";
|
||||
# port = 88;
|
||||
# }];
|
||||
# imaps = [{
|
||||
# host = "mail.fudo.org";
|
||||
# port = 993;
|
||||
# }];
|
||||
# ldap = [{
|
||||
# host = "france.fudo.org";
|
||||
# port = 389;
|
||||
# }];
|
||||
# ldaps = [{
|
||||
# host = "france.fudo.org";
|
||||
# port = 636;
|
||||
# }];
|
||||
# pop3s = [{
|
||||
# host = "mail.fudo.org";
|
||||
# port = 995;
|
||||
# }];
|
||||
http = [{
|
||||
host = "wiki.fudo.org";
|
||||
port = 80;
|
||||
@ -90,56 +45,26 @@
|
||||
host = "wiki.fudo.org";
|
||||
port = 80;
|
||||
}];
|
||||
# xmpp-server = [{
|
||||
# host = "fudo.im";
|
||||
# port = 5269;
|
||||
# }];
|
||||
# xmpp-client = [{
|
||||
# host = "fudo.im";
|
||||
# port = 5222;
|
||||
# }];
|
||||
};
|
||||
udp = {
|
||||
# domain = [
|
||||
# {
|
||||
# host = "ns1.fudo.org";
|
||||
# port = 53;
|
||||
# }
|
||||
# {
|
||||
# host = "ns2.fudo.org";
|
||||
# port = 53;
|
||||
# }
|
||||
# {
|
||||
# host = "ns3.fudo.org";
|
||||
# port = 53;
|
||||
# }
|
||||
# {
|
||||
# host = "ns4.fudo.org";
|
||||
# port = 53;
|
||||
# }
|
||||
# ];
|
||||
# kerberos = [{
|
||||
# host = "france.fudo.org";
|
||||
# port = 88;
|
||||
# }];
|
||||
# kerberos-master = [{
|
||||
# host = "france.fudo.org";
|
||||
# port = 88;
|
||||
# }];
|
||||
# kpasswd = [{
|
||||
# host = "france.fudo.org";
|
||||
# port = 464;
|
||||
# }];
|
||||
};
|
||||
};
|
||||
|
||||
hosts = {
|
||||
cashew = { ipv4-address = "208.81.4.82"; };
|
||||
cisco = { ipv4-address = "198.163.150.211"; };
|
||||
cisco-int = { ipv4-address = "10.73.77.10"; };
|
||||
cupid = { ipv4-address = "208.38.36.100"; };
|
||||
docker = { ipv4-address = "208.81.3.126"; };
|
||||
france = { ipv4-address = "208.81.3.117"; };
|
||||
a.ipv4-address = "192.0.2.1";
|
||||
b.ipv4-address = "198.51.100.1";
|
||||
c.ipv4-address = "203.0.113.1";
|
||||
asgard.ipv4-address = "208.81.1.140";
|
||||
bal-linux1.ipv4-address = "24.77.174.77";
|
||||
blueroom-shaw-gw.ipv4-address = "24.86.8.1";
|
||||
cannes.ipv4-address = "208.81.3.122";
|
||||
cashew.ipv4-address = "208.81.4.82";
|
||||
cisco.ipv4-address = "198.163.150.211";
|
||||
cisco-int.ipv4-address = "10.73.77.10";
|
||||
colvin-shaw-gw.ipv4-address = "24.70.176.1";
|
||||
cupid.ipv4-address = "208.38.36.100";
|
||||
darkstar.ipv4-address = "50.72.152.34";
|
||||
dd-wrt.ipv4-address = "50.72.158.246";
|
||||
docker.ipv4-address = "208.81.3.126";
|
||||
france.ipv4-address = "208.81.3.117";
|
||||
frankfurt = {
|
||||
ipv4-address = "208.81.3.120";
|
||||
ipv6-address = "2605:e200:d200:1:5054:ff:fe8c:9738";
|
||||
@ -148,33 +73,64 @@
|
||||
ipv4-address = "208.81.3.116";
|
||||
ipv6-address = "2605:e200:d200:1:78d9:d8ff:fe0f:dd88";
|
||||
};
|
||||
getjacked.ipv4-address = "24.77.70.221";
|
||||
hamburg.ipv4-address = "208.81.3.124";
|
||||
hanover = {
|
||||
ipv4-address = "208.81.1.130";
|
||||
ipv6-address = "2605:e200:d100:1:5054:ff:fe61:ac8b";
|
||||
};
|
||||
hermes.ipv4-address = "208.81.3.118";
|
||||
hydro.ipv4-address = "192.253.209.254";
|
||||
legatus.ipv4-address = "91.229.23.204";
|
||||
localhost = { ipv4-address = "127.0.0.1"; };
|
||||
lsbb-gba = { ipv4-address = "199.101.56.34"; };
|
||||
lsbb-abg = { ipv4-address = "199.101.56.38"; };
|
||||
lsbb-hwd = { ipv4-address = "199.101.56.106"; };
|
||||
lsbb-hcl = { ipv4-address = "199.101.56.110"; };
|
||||
nutboy3 = { ipv4-address = "199.87.154.175"; };
|
||||
procul = { ipv4-address = "172.86.179.18"; };
|
||||
prunel = { ipv4-address = "208.81.3.123"; };
|
||||
mbix = { ipv4-address = "208.81.7.146"; };
|
||||
ns1 = { ipv4-address = "208.81.1.141"; };
|
||||
ns3-fudo = { ipv4-address = "208.75.74.205"; };
|
||||
ns3-dair = { ipv4-address = "208.75.74.205"; };
|
||||
ns4-fudo = { ipv4-address = "208.75.75.157"; };
|
||||
ns4-dair = { ipv4-address = "208.75.75.157"; };
|
||||
localhost.ipv4-address = "127.0.0.1";
|
||||
loki.ipv4-address = "208.81.1.137";
|
||||
lsbb-abg.ipv4-address = "199.101.56.38";
|
||||
lsbb-gba.ipv4-address = "199.101.56.34";
|
||||
lsbb-hcl.ipv4-address = "199.101.56.110";
|
||||
lsbb-hwd.ipv4-address = "199.101.56.106";
|
||||
mbix.ipv4-address = "208.81.7.146";
|
||||
nero.ipv4-address = "24.76.21.215";
|
||||
ns3-fudo.ipv4-address = "208.75.74.205";
|
||||
ns3-dair.ipv4-address = "208.75.74.205";
|
||||
ns4-fudo.ipv4-address = "208.75.75.157";
|
||||
ns4-dair.ipv4-address = "208.75.75.157";
|
||||
nutboy3.ipv4-address = "199.87.154.175";
|
||||
odin.ipv4-address = "208.81.1.132";
|
||||
olympus.ipv4-address = "208.81.1.141";
|
||||
paris = {
|
||||
ipv4-address = "208.81.3.125";
|
||||
ipv6-address = "2605:e200:d200:1:5054:ff:fe67:d0c1";
|
||||
};
|
||||
probe = { ipv4-address = "208.81.3.119"; };
|
||||
pfh.ipv4-address = "192.253.209.252";
|
||||
pinky.ipv4-address = "24.79.84.52";
|
||||
probe.ipv4-address = "208.81.3.119";
|
||||
procul.ipv4-address = "172.86.179.18";
|
||||
prunel.ipv4-address = "208.81.3.123";
|
||||
r3d3-shaw-gw.ipv4-address = "24.76.22.55";
|
||||
shinji.ipv4-address = "66.222.160.59";
|
||||
silverstar.ipv4-address = "24.78.18.30";
|
||||
spasm.ipv4-address = "68.149.205.244";
|
||||
ssf.ipv4-address = "192.253.209.253";
|
||||
subversive1.ipv4-address = "208.81.1.136";
|
||||
tarbash.ipv4-address = "68.185.42.85";
|
||||
thor.ipv4-address = "208.81.1.131";
|
||||
tours = {
|
||||
ipv4-address = "208.81.3.121";
|
||||
ipv6-address = "2605:e200:d200:1:5054:ff:fe95:34e5";
|
||||
};
|
||||
trogdor.ipv4-address = "24.79.88.253";
|
||||
tyr.ipv4-address = "208.81.1.133";
|
||||
uk.ipv4-address = "81.104.190.151";
|
||||
upbringer.ipv4-address = "24.77.55.208";
|
||||
usashi.ipv4-address = "209.177.109.150";
|
||||
};
|
||||
|
||||
subdomains = {
|
||||
test = {
|
||||
aliases = {
|
||||
git = "nutboy3.fudo.org.";
|
||||
webmail = "nutboy3.fudo.org.";
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user