@cryptotaxi247 / infra / commits / 117650fc

Remove mrkitty

Eelco Dolstra committed Mar 8, 2016 at 13:58 UTC 117650fcc70c37ff439964cbfc72a85355ab598a
4 files changed -75
delft/machines.nix
-8
@@ -121,14 +121,6 @@ lib: with lib;
121 systems = [ "x86_64-linux" ];
122 }
123
124 - { # Legacy JIRA server, put in its own Xen ghetto because our JIRA
125 - # is very old and probably insecure.
126 - hostName = "mrkitty";
127 - ipAddress = "192.168.1.52";
128 - ethernetAddress = "00:16:3e:00:00:03";
129 - systems = [ "x86_64-linux" ];
130 - }
131 -
124 { # Another NixOS test machine.
125 hostName = "clyde";
126 ipAddress = "192.168.1.55";
delft/mrkitty.nix deleted
-55
@@ -1,55 +0,0 @@
1 -# JIRA server.
2 -
3 -{ config, pkgs, modulesPath, ... }:
4 -
5 -with pkgs.lib;
6 -
7 -let
8 -
9 - jiraJetty = (import ../../services/jira/jira-instance.nix {
10 - inherit pkgs;
11 - dbHost = "130.161.159.114"; # webdsl.org
12 - dbPassword = import ./jira-password.nix;
13 - }).jetty;
14 -
15 -in
16 -
17 -{
18 - require = [ "${modulesPath}/virtualisation/xen-domU.nix" ./common.nix ];
19 -
20 - nixpkgs.system = "x86_64-linux";
21 -
22 - networking.hostName = "mrkitty";
23 -
24 - fileSystems =
25 - [ { mountPoint = "/";
26 - label = "nixos";
27 - }
28 - ];
29 -
30 - services.sshd.enable = true;
31 -
32 - users.extraUsers = singleton
33 - { name = "jira";
34 - description = "JIRA bug tracker";
35 - };
36 -
37 - jobs.jira =
38 - { description = "JIRA bug tracker";
39 -
40 - startOn = "started network-interfaces";
41 -
42 - preStart =
43 - ''
44 - mkdir -p /var/log/jetty /var/cache/jira /var/cache/jira/issues
45 - chown jira /var/log/jetty /var/cache/jira /var/cache/jira/issues
46 - '';
47 -
48 - exec = "${pkgs.su}/bin/su -s ${pkgs.bash}/bin/sh jira -c '${jiraJetty}/bin/run-jetty'";
49 -
50 - postStop =
51 - ''
52 - ${pkgs.su}/bin/su -s ${pkgs.bash}/bin/sh jira -c '${jiraJetty}/bin/stop-jetty'
53 - '';
54 - };
55 -}
delft/network.nix
-1
@@ -8,6 +8,5 @@
8 wendy = import ./wendy.nix;
9 ike = import ./build-machines-dell-r815.nix;
10 #shelley = import ./build-machines-dell-r815.nix;
11 - #mrkitty = import ./mrkitty.nix;
11 #mrhankey = import ./mrhankey.nix;
12 }
delft/xen-configs/mrkitty deleted
-11
@@ -1,11 +0,0 @@
1 -from xen.util.path import *
2 -
3 -memory = 512
4 -
5 -kernel = XENFIRMWAREDIR + '/pv-grub-x86_64.gz'
6 -
7 -extra = '(hd0)/boot/grub/menu.lst'
8 -
9 -disk = [ 'file:/vmdisks/mrkitty-root.img,xvda1,w' ]
10 -
11 -vif = [ 'mac=00:16:3e:00:00:03' ]