Remove more retired machines
Eelco Dolstra committed
Mar 8, 2016 at 14:07 UTC
b4e84819ebe4f6f88eb6ef23b99ebc761fec35bc
9 files changed
+3
-236
delft/cartman.nix
deleted
-67
@@ -1,67 +0,0 @@
1
-{ config, pkgs, ... }:
2
-
3
-with pkgs.lib;
4
-
5
-let
6
-
7
- duplicityBackup = pkgs.writeScript "backup-duplicity" ''
8
- #! /bin/sh
9
- echo "Starting backups"
10
- export PATH=$PATH:/var/run/current-system/sw/bin
11
- time duplicity --full-if-older-than 30D --no-encryption /data/pt-wiki file:///backup/cartman/pt-wiki
12
- time duplicity --no-encryption --force remove-all-inc-of-but-n-full 1 file:///backup/cartman/pt-wiki
13
-
14
- time duplicity --full-if-older-than 30D --no-encryption /data/subversion file:///backup/cartman/subversion
15
- time duplicity --no-encryption --force remove-all-inc-of-but-n-full 1 file:///backup/cartman/subversion
16
-
17
- time duplicity --full-if-older-than 30D --no-encryption /data/subversion-ptg file:///backup/cartman/subversion-ptg
18
- time duplicity --no-encryption --force remove-all-inc-of-but-n-full 1 file:///backup/cartman/subversion-ptg
19
-
20
- time duplicity --full-if-older-than 30D --no-encryption /data/subversion-strategoxt file:///backup/cartman/subversion-strategoxt
21
- time duplicity --no-encryption --force remove-all-inc-of-but-n-full 1 file:///backup/cartman/subversion-strategoxt
22
-
23
- echo Done
24
- '';
25
-
26
- ZabbixApacheUpdater = pkgs.fetchsvn {
27
- url = https://www.zulukilo.com/svn/pub/zabbix-apache-stats/trunk/fetch.py;
28
- sha256 = "1q66x429wpqjqcmlsi3x37rkn95i55nj8ldzcrblnx6a0jnjgd2g";
29
- rev = 94;
30
- };
31
-
32
-in
33
-
34
-rec {
35
- require = [ ./common.nix ];
36
-
37
- nixpkgs.system = "x86_64-linux";
38
-
39
- boot = {
40
- loader.grub.device = "/dev/sda";
41
- loader.grub.copyKernels = true;
42
- initrd.kernelModules = ["arcmsr"];
43
- kernelModules = ["kvm-intel"];
44
- };
45
-
46
- fileSystems."/" =
47
- { label = "nixos";
48
- options = "acl";
49
- };
50
- fileSystems."/backup" =
51
- { device = "130.161.158.5:/dxs/users4/group/buildfarm";
52
- fsType = "nfs4";
53
- };
54
-
55
- #swapDevices = [ { label = "swap1"; } ];
56
-
57
- nix.maxJobs = 2;
58
-
59
- services.cron.mailto = "rob.vermaas@gmail.com";
60
- services.cron.systemCronJobs =
61
- [ #"15 0 * * * root (TZ=CET date; ${pkgs.rsync}/bin/rsync -razv --numeric-ids --delete /data/postgresql /data/webserver/tarballs unixhome.st.ewi.tudelft.nl::bfarm/) >> /var/log/backup.log 2>&1"
62
- "* * * * * root ${pkgs.python}/bin/python ${ZabbixApacheUpdater} -z 192.168.1.5 -c cartman"
63
- "40 * * * * root ${duplicityBackup} &>> /var/log/backup-duplicity.log"
64
- ];
65
-
66
- environment.systemPackages = [ pkgs.duplicity ];
67
-}
delft/drdoctor.nix
deleted
-28
@@ -1,28 +0,0 @@
1
-# NixOS test machine.
2
-
3
-{ config, pkgs, modulesPath, ... }:
4
-
5
-{
6
- require = [ "${modulesPath}/virtualisation/xen-domU.nix" ];
7
-
8
- networking.hostName = "";
9
-
10
- fileSystems =
11
- [ { mountPoint = "/";
12
- label = "nixos";
13
- }
14
- { mountPoint = "/boot";
15
- label = "boot";
16
- }
17
- ];
18
-
19
- services.openssh.enable = true;
20
-
21
- # The kernel's default overcommit heuristic renders Nix incapable of
22
- # forking on machines with little RAM (unless GC_INITIAL_HEAP_SIZE
23
- # is set to a low value). So turn off checking.
24
- boot.postBootCommands =
25
- ''
26
- echo 1 > /proc/sys/vm/overcommit_memory
27
- '';
28
-}
delft/machines.nix
+3
-46
@@ -2,15 +2,6 @@ lib: with lib;
2
3
[ /* Physical machines. */
4
5
- { # Web frontend.
6
- hostName = "cartman";
7
- ipAddress = "192.168.1.5";
8
- ethernetAddress = "00:19:d1:19:28:bf";
9
- systems = [ "x86_64-linux" "i686-linux" ];
10
- aliases = ["main"];
11
- maxJobs = 2;
12
- }
13
-
5
/*
6
{ # APC UPS.
7
hostName = "ups";
@@ -49,16 +40,6 @@ lib: with lib;
40
buildUser = "buildfarm";
41
}
42
52
- { # Windows XP build machine.
53
- hostName = "garrison";
54
- ipAddress = "192.168.1.11";
55
- ethernetAddress = "00:19:d1:10:37:54";
56
- system = "i686-cygwin";
57
- aliases = ["winxp32-1" "winxp32" "winxp"];
58
- maxJobs = 2;
59
- buildUser = "nix";
60
- }
61
-
43
{ # 64-bit Mac OS X build machine.
44
hostName = "butters";
45
ipAddress = "131.180.119.68";
@@ -69,25 +50,19 @@ lib: with lib;
50
buildUser = "nix";
51
}
52
72
- { # Old Hydra server.
53
+ { # Old Hydra server, now build machine.
54
hostName = "hydra";
55
ipAddress = "131.180.119.69";
56
ethernetAddress = "00:22:19:55:bf:24";
57
}
58
78
- { # Xen machine.
79
- hostName = "mrhankey";
80
- ipAddress = "192.168.1.24";
81
- ethernetAddress = "00:1d:09:0e:09:e5";
82
- }
83
-
84
- { # Hydra server.
59
+ { # Old Hydra server, now build machine.
60
hostName = "lucifer";
61
ipAddress = "131.180.119.73";
62
ethernetAddress = "84:2b:2b:0b:98:f0";
63
}
64
90
- { # 48-core NixOS front-end proxy, database server, build machine.
65
+ { # 48-core NixOS web server (zabbix / wiki), database server, build machine.
66
hostName = "wendy";
67
ipAddress = "131.180.119.77";
68
ethernetAddress = "f0:4d:a2:40:1b:c0";
@@ -111,24 +86,6 @@ lib: with lib;
86
*/
87
88
114
- /* Xen VMs hosted on mrhankey. Note that 00:16:3e is the prefix for
115
- Xen MAC addresses. */
116
-
117
- { # NixOS test machine.
118
- hostName = "drdoctor";
119
- ipAddress = "192.168.1.51";
120
- ethernetAddress = "00:16:3e:00:00:02";
121
- systems = [ "x86_64-linux" ];
122
- }
123
-
124
- { # Another NixOS test machine.
125
- hostName = "clyde";
126
- ipAddress = "192.168.1.55";
127
- ethernetAddress = "00:16:3e:00:00:06";
128
- systems = [ "x86_64-linux" ];
129
- }
130
-
131
-
89
/* KVM VMs hosted on stan. */
90
91
{ # 32-bit OpenIndiana 151a (in a VM).
delft/mrhankey.nix
deleted
-28
@@ -1,28 +0,0 @@
1
-{ config, pkgs, ... }:
2
-
3
-with pkgs.lib;
4
-
5
-{
6
- require = [ ./common.nix ];
7
-
8
- nixpkgs.system = "x86_64-linux";
9
-
10
- #virtualisation.xen.enable = true;
11
- #virtualisation.xen.domain0MemorySize = 512;
12
-
13
- boot.loader.grub.device = "/dev/sda";
14
- boot.initrd.kernelModules = [ "mptbase" "mptscsih" "mptsas" ];
15
-
16
- fileSystems =
17
- [ { mountPoint = "/";
18
- label = "nixos";
19
- fsType = "ext3";
20
- }
21
- ];
22
-
23
- swapDevices = [ { label = "swap"; } ];
24
-
25
- networking.hostName = "";
26
-
27
- services.openssh.enable = true;
28
-}
delft/network.nix
-2
@@ -3,10 +3,8 @@
3
kyle = import ./build-machines-dell-1950.nix;
4
hydra = import ./build-machines-dell-1950.nix;
5
stan = import ./build-machines-dell-1950.nix;
6
- #cartman = import ./cartman.nix;
6
lucifer = import ./lucifer.nix;
7
wendy = import ./wendy.nix;
8
ike = import ./build-machines-dell-r815.nix;
9
#shelley = import ./build-machines-dell-r815.nix;
11
- #mrhankey = import ./mrhankey.nix;
10
}
delft/xen-configs/drdoctor
deleted
-16
@@ -1,16 +0,0 @@
1
-from xen.util.path import *
2
-
3
-name = 'drdoctor'
4
-
5
-memory = 512
6
-
7
-kernel = XENFIRMWAREDIR + '/pv-grub-x86_64.gz'
8
-
9
-extra = '(hd0)/grub/menu.lst'
10
-
11
-disk = [ 'file:/vmdisks/drdoctor-boot.img,xvda1,w'
12
- , 'file:/vmdisks/drdoctor-root.img,xvda2,w' ]
13
-
14
-vif = [ 'mac=00:16:3e:00:00:02' ]
15
-
16
-vfb = [ 'vnc=2' ]
delft/xen-configs/losser
deleted
-13
@@ -1,13 +0,0 @@
1
-# Losser is a FreeBSD 4 machine.
2
-
3
-kernel = "hvmloader"
4
-
5
-builder = "hvm"
6
-
7
-memory = 384
8
-
9
-disk = [ 'file:/vmdisks/losser-disk1.img,hda,w' ]
10
-
11
-vif = [ 'mac=00:16:3e:00:00:04' ]
12
-
13
-vfb = [ 'vnc=1' ]
delft/xen-configs/meerkat
deleted
-17
@@ -1,17 +0,0 @@
1
-# Ubuntu 10.10 (Maverick Meerkat)
2
-
3
-kernel = "hvmloader"
4
-
5
-builder = "hvm"
6
-
7
-memory = 1024
8
-
9
-disk = [ 'file:/vmdisks/meerkat-disk1.img,hda,w'
10
- #, 'file:/root/isos/ubuntu-10.10-desktop-i386.iso,hdc:cdrom,r'
11
- ]
12
-
13
-boot = "dc"
14
-
15
-vif = [ 'mac=00:16:3e:00:00:05' ]
16
-
17
-vfb = [ 'vnc=1' ]
delft/xen-configs/tweek
deleted
-19
@@ -1,19 +0,0 @@
1
-# Tweek is an OpenSolaris VM.
2
-
3
-kernel = "hvmloader"
4
-
5
-builder = "hvm"
6
-
7
-name = "tweek"
8
-
9
-memory = 1024
10
-
11
-disk = [ 'file:/vmdisks/tweek-disk1.img,hda,w'
12
- #, 'file:/root/isos/osol-0906-x86.iso,hdc:cdrom,r'
13
- ]
14
-
15
-#boot = "dc"
16
-
17
-vif = [ 'mac=00:16:3e:00:00:01' ]
18
-
19
-vfb = [ 'vnc=1' ]