Remove ike and wendy
Eelco Dolstra committed
Sep 20, 2021 at 12:11 UTC
802db950e468d7722ac0ae13029b24a3810ca7fb
9 files changed
-182
delft/build-machines-dell-r815.nix
deleted
-29
@@ -1,29 +0,0 @@
1
-{ config, pkgs, ... }:
2
-
3
-{
4
- imports =
5
- [ ./build-machines-common.nix
6
- ./megacli.nix
7
- ./datadog.nix
8
- ];
9
-
10
- boot.loader.grub.device = "/dev/sda";
11
- boot.loader.grub.copyKernels = true;
12
-
13
- fileSystems."/" =
14
- { label = "nixos";
15
- options = [ "noatime" ];
16
- };
17
-
18
- fileSystems."/tmp" =
19
- { device = "none";
20
- fsType = "tmpfs";
21
- options = [ "size=50%" ];
22
- neededForBoot = true;
23
- };
24
-
25
- boot.initrd.kernelModules = [ "megaraid_sas" "ext4" ];
26
- boot.kernelModules = [ "acpi-cpufreq" "kvm-amd" ];
27
-
28
- nix.maxJobs = 48;
29
-}
delft/eris.nix
-2
@@ -20,10 +20,8 @@ in {
20
10.254.1.1 bastion
21
10.254.1.3 ceres
22
23
- 10.254.1.5 ike
23
10.254.1.6 hydra
24
10.254.1.7 lucifer
26
- 10.254.1.8 wendy
25
10.254.1.9 haumea
26
27
10.254.3.1 webserver
delft/hydra.nix
-2
@@ -184,10 +184,8 @@ in
184
macstadium1 = { hostNames = [ "208.78.106.251" ]; publicKey = "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKrwg2592DfDUG1U0LZxJcBaT35YfEsuKo4helEAzeoujvzOo4DIaBrTCX7+LxcYZlGoi4WvsnwxUG11GY12l2A="; };
185
macstadium2 = { hostNames = [ "208.78.106.252" ]; publicKey = "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBLV1p6f6Rk3rKwNJbcqvG68wjfT3wPcJfChc1LFU9A3tTFslUDr47FHLmT+FTr+ChkoqD6Gsl+jtSnvkYnTlpGY="; };
186
hydra = { hostNames = [ "hydra.ewi.tudelft.nl" "131.180.119.69" ]; publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIS6QYRKqOt9zfvFej4WWaswLE8Mhq7dOk8enWi/AzoK"; };
187
- ike = { hostNames = [ "ike.ewi.tudelft.nl" "131.180.119.70" ]; publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDTj/aLPNA+D3ysNPzGMRGVqfu0BzRx2k0LJJRqeN+S+"; };
187
lucifer = { hostNames = [ "lucifer.ewi.tudelft.nl" "131.180.119.73" ]; publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDz6dxwVdxPpwtjO3wA9nMp62qFLGy2ETpSQ6JWTOs5P"; };
188
stan = { hostNames = [ "stan.ewi.tudelft.nl" "131.180.119.74" ]; publicKey = "ssh-dss AAAAB3NzaC1kc3MAAACBAL0SlYpGjDjPKrLIwoltYHHTYo/d6Ct2FQZKh4ltKOszWPYYAbs/YNSm2eFkvj0CGc3aastFuebz6+pRfvGMvqi4q6IoHwVvOkbWMadyuqrWIO+Z1YemZP/GAG69pLy+UyoydiSI83ycwPe4YARAU/cpBMNKJZbSxyrO80XatmtRAAAAFQC291WK+9M8+zI4KAtk6EqX0vqQ1QAAAIBd1YgRfdfRdu60BpR+3/YMbSYZMjRLFPyoSgmEQR2TtKfqsuKTsTREzB20iMgFlhEWb6C4r5y6jYDU85OOnvpf7zne22j6bKFDIiAbgsjUFHK1EB7+TBltf5yqq0FyNOy/PnLqVzOeGaUeCOc3Ris71Lxkm60oVF4mjut2d2UJ6AAAAIByuCH1bIIRb4za4yiiFQUz2CBX1XHhBn/h/LhNMLuyCTciG6tkppGBAgq5rWrNhjaEc7dIFgZR+E1wE5PQzWG/TBiXctwCOqOOErDB5b95jO2EntIhi8x5PO9Ef6jgis4QRsBIZiENDDeQHxFHCv4q+10TpyV+625O8TXkkcxl0g=="; };
190
- wendy = { hostNames = [ "wendy.ewi.tudelft.nl" "131.180.119.77" ]; publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBQOW9V+azndhOiWApltwo7Khnc5/MNEAW8Rf5J/NyBx"; };
189
190
t2m = { hostNames = [ "t2m.cunat.cz" ]; publicKey = "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBP9351NRVeQYvNV1bBbC5MX0iSmrXhVcBYMcn6AMo11U2zlOYRqBPzGLPjz9u31t4FxHNovxCrkFTqJY9zbsmTs="; };
191
t2a = { hostNames = [ "t2a.cunat.cz" ]; publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIu3itg4hn5e4KrnyoreAUN3RIbAcvqc7yWx5i6EWqAu"; };
delft/machines.nix
-14
@@ -32,20 +32,6 @@ lib: with lib;
32
ethernetAddress = "84:2b:2b:0b:98:f0";
33
}
34
35
- { # 48-core NixOS web server (wiki), database server, build machine.
36
- hostName = "wendy";
37
- ipAddress = "131.180.119.77";
38
- ethernetAddress = "f0:4d:a2:40:1b:c0";
39
- systems = [ "x86_64-linux" ];
40
- }
41
-
42
- { # 48-core NixOS build machine.
43
- hostName = "ike";
44
- ipAddress = "131.180.119.70";
45
- ethernetAddress = "f0:4d:a2:40:1b:91";
46
- systems = [ "x86_64-linux" ];
47
- }
48
-
35
/*
36
{ # 48-core NixOS build machine.
37
hostName = "shelley";
delft/network.nix
-2
@@ -63,8 +63,6 @@ in {
63
64
hydra = { deployment.targetHost = "hydra.ewi.tudelft.nl"; imports = [ ./build-machines-dell-1950.nix ]; };
65
lucifer = { deployment.targetHost = "lucifer.ewi.tudelft.nl"; imports = [ ./lucifer.nix ]; };
66
- wendy = { deployment.targetHost = "wendy.ewi.tudelft.nl"; imports = [ ./wendy.nix ]; };
67
- ike = { deployment.targetHost = "ike.ewi.tudelft.nl"; imports = [ ./build-machines-dell-r815.nix ]; };
66
67
eris = import ./eris.nix;
68
delft/twiki.nix
deleted
-80
@@ -1,80 +0,0 @@
1
-/* Configuration for the NixOS container that runs strategoxt.org,
2
- program-transformation.org and syntax-definition.org. TWiki
3
- requires an old version of Nixpkgs, so we put it into a container.
4
-
5
- The TWiki data lives in /data/pt-wiki in the container, which
6
- itself resides in /var/lib/containers/twiki.
7
-
8
- To rebuild the container (from wendy):
9
-
10
- $ NIX_PATH=nixpkgs=channel:nixos-17.03 nixos-container update twiki --config-file /etc/nixos/nixos-org-configurations/delft/twiki.nix
11
-
12
- To login to the container:
13
-
14
- $ nixos-container root-login twiki
15
-
16
-*/
17
-
18
-{ config, pkgs, ... }:
19
-
20
-{
21
-
22
- networking.firewall.allowedTCPPorts = [ 80 ];
23
-
24
- services = {
25
-
26
- httpd = {
27
- enable = true;
28
- adminAddr = "edolstra@gmail.com";
29
- hostName = "localhost";
30
-
31
- virtualHosts = [
32
-
33
- { hostName = "strategoxt.org";
34
- servedFiles = [
35
- { urlPath = "/freenode.ver";
36
- file = "/data/pt-wiki/pub/freenode.ver";
37
- }
38
- ];
39
- extraSubservices = [
40
- { function = import /etc/nixos/services/twiki;
41
- startWeb = "Stratego/WebHome";
42
- dataDir = "/data/pt-wiki/data";
43
- pubDir = "/data/pt-wiki/pub";
44
- twikiName = "Stratego/XT Wiki";
45
- registrationDomain = "ewi.tudelft.nl";
46
- }
47
- ];
48
- }
49
-
50
- { hostName = "program-transformation.org";
51
- extraSubservices = [
52
- { function = import /etc/nixos/services/twiki;
53
- startWeb = "Transform/WebHome";
54
- dataDir = "/data/pt-wiki/data";
55
- pubDir = "/data/pt-wiki/pub";
56
- twikiName = "Program Transformation Wiki";
57
- registrationDomain = "ewi.tudelft.nl";
58
- }
59
- ];
60
- }
61
-
62
- { hostName = "syntax-definition.org";
63
- extraSubservices = [
64
- { function = import /etc/nixos/services/twiki;
65
- startWeb = "Sdf/WebHome";
66
- dataDir = "/data/pt-wiki/data";
67
- pubDir = "/data/pt-wiki/pub";
68
- twikiName = "Syntax Definition Wiki";
69
- registrationDomain = "ewi.tudelft.nl";
70
- }
71
- ];
72
- }
73
-
74
- ];
75
-
76
- };
77
-
78
- };
79
-
80
-}
\ No newline at end of file
delft/wendy.nix
deleted
-38
@@ -1,38 +0,0 @@
1
-{ config, lib, pkgs, ... }:
2
-
3
-with lib;
4
-
5
-{
6
- imports = [ ./build-machines-dell-r815.nix ./sysstat.nix ./datadog.nix ];
7
-
8
- nix = {
9
- maxJobs = mkForce 24;
10
- buildCores = mkForce 12;
11
- };
12
-
13
- users.extraUsers.eelco =
14
- { description = "Eelco Dolstra";
15
- home = "/home/eelco";
16
- isNormalUser = true;
17
- openssh.authorizedKeys.keys = [ (import ../ssh-keys.nix).eelco ];
18
- };
19
-
20
- users.extraUsers.danny =
21
- { description = "Danny Groenewegen";
22
- home = "/home/danny";
23
- isNormalUser = true;
24
- openssh.authorizedKeys.keys = [ (import ../ssh-keys.nix).danny ];
25
- extraGroups = [ "wheel" ];
26
- createHome = true;
27
- };
28
-
29
- users.extraUsers.rbvermaa =
30
- { description = "Rob Vermaas";
31
- home = "/home/rbvermaa";
32
- isNormalUser = true;
33
- extraGroups = [ "wheel" ];
34
- openssh.authorizedKeys.keys = [ (import ../ssh-keys.nix).rob ];
35
- };
36
-
37
- security.pam.enableSSHAgentAuth = true;
38
-}
docs/inventory.md
-2
@@ -188,10 +188,8 @@ Univesity Data Center that contains a bunch of machines.
188
189
190
- delft/machines.nix that has all the IPs and mac address of machines there
191
-- wendy; 48 core machine; dying 😕 both for build slave and used to deploy all the other infrastructure (eg: hydra.nixos.org)
191
- hydra (machine name); build slave
192
- lucifer: build slave
194
-- ike: build slave
193
194
+ bunch of dead machines
195
modules/wireguard.nix
-13
@@ -29,13 +29,6 @@ let
29
publicKey = "H/Y+sbNETKZugxGFbOS0m5BSr28jRDL19U37wEw07D8=";
30
};
31
32
- ike = {
33
- ip = "10.254.1.5";
34
- endpoint = "131.180.119.70";
35
- port = 51820;
36
- publicKey = "0Gnpua+K9Ms4m56j99KLrHNTbqDBLLp96eY9vmJbozQ=";
37
- };
38
-
32
hydra = {
33
ip = "10.254.1.6";
34
endpoint = "131.180.119.69";
@@ -49,12 +42,6 @@ let
42
port = 51820;
43
};
44
52
- wendy = {
53
- ip = "10.254.1.8";
54
- enpdoint = "131.180.119.77";
55
- port = 51820;
56
- };
57
-
45
haumea = {
46
ip = "10.254.1.9";
47
endpoint = "46.4.89.205";