Merge "neo-cluster" branch, remain backwards-compatible to the old config

.gitignore

@@ -1 +1,2 @@
 result
+/configuration.nix

README.md

@@ -1,50 +1,3 @@
-# SNS Cluster Configuration
+Princeton SNS Group Cluster Configuration
+=========================================
 
-## Machine Specs
-
-| Cluster | CPU                    | RAM  | HDD   | SSD     |
-|---------|------------------------|------|-------------|---------|
-| Adam    | 2x8 2.2GHz Intel Xeon  | 64GB | 4x2TB (in RAID) |         |
-| Alpha   | 2x4 2.3GHz AMD Opetron | 8GB  | 2x1TB | -       |
-| Beta    | 2x4 2.4GHz Intel Xeon  | 12GB | 2x1TB | 150GB   |
-| Gamma   | 2x8 2.2GHz Intel Xeon  | 64GB | 1TB   | 2x240GB |
-| SNS57   | 2x4 2.4GHz Intel Xeon  | 64GB | 2x1TB | 150GB   |
-
-
-### Alpha Cluster -- Old SUN Systems
-
-1. sns3.cs.princeton.edu
-2. sns4.cs.princeton.edu
-3. sns6.cs.princeton.edu
-4. sns7.cs.princeton.edu
-5. sns8.cs.princeton.edu
-6. sns9.cs.princeton.edu
-7. sns14.cs.princeton.edu
-7. sns15.cs.princeton.edu
-8. sns17.cs.princeton.edu
-9. sns20.cs.princeton.edu
-10. sns21.cs.princeton.edu
-11. sns24.cs.princeton.edu
-
-### Beta Cluster -- Remote Workstations
-
-1. sns26.cs.princeton.edu
-2. sns29.cs.princeton.edu
-3. sns31.cs.princeton.edu
-4. sns32.cs.princeton.edu
-5. sns33.cs.princeton.edu
-6. sns44.cs.princeton.edu
-6. sns45.cs.princeton.edu
-8. sns49.cs.princeton.edu
-9. sns51.cs.princeton.edu
-10. sns52.cs.princeton.edu
-11. ~~sns55.cs.princeton.edu~~ (needs manual intervention)
-12. ~~sns55.cs.princeton.edu~~ (needs manual intervention)
-
-## Gamma Cluster -- Temporary Reservations
-
-1. sns59.cs.princeton.edu
-
-## One-offs
-
-1. sns57.cs.princeton.edu

default.nix

@@ -0,0 +1 @@
+./legacy/default.nix

legacy/README.md

@@ -0,0 +1,50 @@
+# SNS Cluster Configuration
+
+## Machine Specs
+
+| Cluster | CPU                    | RAM  | HDD   | SSD     |
+|---------|------------------------|------|-------------|---------|
+| Adam    | 2x8 2.2GHz Intel Xeon  | 64GB | 4x2TB (in RAID) |         |
+| Alpha   | 2x4 2.3GHz AMD Opetron | 8GB  | 2x1TB | -       |
+| Beta    | 2x4 2.4GHz Intel Xeon  | 12GB | 2x1TB | 150GB   |
+| Gamma   | 2x8 2.2GHz Intel Xeon  | 64GB | 1TB   | 2x240GB |
+| SNS57   | 2x4 2.4GHz Intel Xeon  | 64GB | 2x1TB | 150GB   |
+
+
+### Alpha Cluster -- Old SUN Systems
+
+1. sns3.cs.princeton.edu
+2. sns4.cs.princeton.edu
+3. sns6.cs.princeton.edu
+4. sns7.cs.princeton.edu
+5. sns8.cs.princeton.edu
+6. sns9.cs.princeton.edu
+7. sns14.cs.princeton.edu
+7. sns15.cs.princeton.edu
+8. sns17.cs.princeton.edu
+9. sns20.cs.princeton.edu
+10. sns21.cs.princeton.edu
+11. sns24.cs.princeton.edu
+
+### Beta Cluster -- Remote Workstations
+
+1. sns26.cs.princeton.edu
+2. sns29.cs.princeton.edu
+3. sns31.cs.princeton.edu
+4. sns32.cs.princeton.edu
+5. sns33.cs.princeton.edu
+6. sns44.cs.princeton.edu
+6. sns45.cs.princeton.edu
+8. sns49.cs.princeton.edu
+9. sns51.cs.princeton.edu
+10. sns52.cs.princeton.edu
+11. ~~sns55.cs.princeton.edu~~ (needs manual intervention)
+12. ~~sns55.cs.princeton.edu~~ (needs manual intervention)
+
+## Gamma Cluster -- Temporary Reservations
+
+1. sns59.cs.princeton.edu
+
+## One-offs
+
+1. sns57.cs.princeton.edu

legacy/default.nix

@@ -0,0 +1,9 @@
+with builtins;
+let
+  utils = import ./utils;
+  machines = utils.modulesIn ./machines;
+  baseSNSMachine = n: (import ./machines/common.nix) { hostname = "sns${n}"; };
+  baseMachines = listToAttrs
+                  (map (n: let ns = toString n; in { name = "sns${ns}"; value = baseSNSMachine ns; })
+                    (genList (n: n + 1) 100));
+in baseMachines // machines

legacy/machines/sns26.nix

@@ -0,0 +1,38 @@
+{ config, pkgs, ... }:
+
+let
+  hostname = "sns26";
+  common = (import ./common.nix) { hostname = hostname; };
+  utils = import ../utils;
+in {
+
+  # Import common configurat for all machines (locale, SSHd, updates...)
+  imports = [ common ];
+
+  # List packages installed in system profile. To search, run:
+  # $ nix search wget
+  environment.systemPackages = with pkgs; [
+    git
+  ];
+
+  programs.mosh.enable = true;
+
+  networking.firewall.allowedTCPPorts = [
+    # Frida server
+    8000
+  ];
+
+  virtualisation.docker.enable = true;
+
+  users.users.npopescu = {
+    isNormalUser = true;
+    extraGroups = [ "wheel" ];
+    openssh.authorizedKeys.keys = utils.githubSSHKeys "nataliepopescu";
+  };
+
+  users.users.leons = {
+    isNormalUser = true;
+    extraGroups = [ "wheel" ];
+    openssh.authorizedKeys.keys = utils.githubSSHKeys "lschuermann";
+  };
+}

legacy/machines/sns29.nix

@@ -0,0 +1,42 @@
+# Configured as a workstation for @alevy, primarily for testing stuff on the
+# cluster. If this comment is still here after November 2020, you can take over
+# this machine with a PR.
+
+{ config, pkgs, ... }:
+
+let
+  hostname = "sns29";
+  common = (import ./common.nix) { hostname = hostname; };
+  utils = import ../utils;
+in {
+
+  # Import common configurat for all machines (locale, SSHd, updates...)
+  imports = [ common ];
+
+  # List packages installed in system profile. To search, run:
+  # $ nix search wget
+  environment.systemPackages = with pkgs; [
+  ];
+
+  programs.mosh.enable = true;
+
+  users.mutableUsers = false;
+
+  users.users.alevy = {
+    isNormalUser = true;
+    extraGroups = [ "wheel" "snapfaas" ];
+    openssh.authorizedKeys.keys = utils.githubSSHKeys "alevy";
+  };
+
+  users.users.yue = {
+    isNormalUser = true;
+    extraGroups = [ "wheel" "snapfaas" ];
+    openssh.authorizedKeys.keys = utils.githubSSHKeys "tan-yue";
+  };
+
+  users.users.kw22 = {
+    isNormalUser = true;
+    extraGroups = [ "snapfaas" ];
+    openssh.authorizedKeys.keys = utils.githubSSHKeys "kw1122";
+  };
+}

legacy/machines/sns31.nix

@@ -0,0 +1,39 @@
+# Configured as a workstation for Jianan 
+# Current project users include Jianan, and Haoyu. 
+
+{ config, pkgs, ... }:
+
+let
+  hostname = "sns31";
+  common = (import ./common.nix) { hostname = hostname; };
+  utils = import ../utils;
+in {
+
+  # Import common configurat for all machines (locale, SSHd, updates...)
+  imports = [ common ];
+
+  # List packages installed in system profile. To search, run:
+  # $ nix search wget
+  environment.systemPackages = with pkgs; [
+  ];
+
+  programs.mosh.enable = true;
+
+  users.users.haoyu = {
+    isNormalUser = true;
+    extraGroups = [ "wheel" ];
+    openssh.authorizedKeys.keys = utils.githubSSHKeys "Lei-Houjyu";
+  };
+
+  users.users.jiananl= {
+    isNormalUser = true;
+    extraGroups = [ "wheel" ];
+    openssh.authorizedKeys.keys = utils.githubSSHKeys "amberlu";
+  };
+
+  users.users.araina= {
+    isNormalUser = true;
+    extraGroups = [ "wheel" ];
+    openssh.authorizedKeys.keys = utils.githubSSHKeys "ashwiniraina";
+  };
+}

legacy/machines/sns32.nix

@@ -0,0 +1,27 @@
+{ config, pkgs, ... }:
+
+let
+  hostname = "sns32";
+  common = (import ./common.nix) { hostname = hostname; };
+  utils = import ../utils;
+in {
+
+  # Import common configurat for all machines (locale, SSHd, updates...)
+  imports = [ common ];
+
+  # List packages installed in system profile. To search, run:
+  # $ nix search wget
+  environment.systemPackages = with pkgs; [
+    git
+  ];
+
+  programs.mosh.enable = true;
+
+  virtualisation.docker.enable = true;
+
+  users.users.scaspin = {
+    isNormalUser = true;
+    extraGroups = [ "wheel" ];
+    openssh.authorizedKeys.keys = utils.githubSSHKeys "scaspin";
+  };
+}

legacy/machines/sns33.nix

@@ -0,0 +1,66 @@
+# Configured as a workstation for @lei
+
+{ config, pkgs, ... }:
+
+let
+  hostname = "sns33";
+  common = (import ./common.nix) { hostname = hostname; };
+  utils = import ../utils;
+  kubeMasterIP = "10.1.1.2";
+  kubeMasterHostname = "api.kube";
+  kubeMasterAPIServerPort = 6443;
+in {
+
+  # Import common configurat for all machines (locale, SSHd, updates...)
+  imports = [ common ];
+
+  networking.extraHosts = "${kubeMasterIP} ${kubeMasterHostname}";
+
+  services.kubernetes = {
+    roles = ["master" "node"];
+    masterAddress = kubeMasterHostname;
+    apiserverAddress = "https://${kubeMasterHostname}:${toString kubeMasterAPIServerPort}";
+    easyCerts = true;
+    apiserver = {
+      securePort = kubeMasterAPIServerPort;
+      advertiseAddress = kubeMasterIP;
+    };
+
+    # use coredns
+    addons.dns.enable = true;
+
+    # needed if you use swap
+    kubelet.extraOpts = "--fail-swap-on=false";
+  };
+
+  # List packages installed in system profile. To search, run:
+  # $ nix search wget
+  environment.systemPackages = with pkgs; [
+    git zip unzip
+    vim tmux wget docker-compose kubectl kompose kubernetes helm
+  ];
+
+  programs.mosh.enable = true;
+
+  virtualisation.docker.enable = true;
+
+  users.mutableUsers = false;
+
+  users.users.lei = {
+    isNormalUser = true;
+    extraGroups = [ "wheel" "docker" ];
+    openssh.authorizedKeys.keys = utils.githubSSHKeys "geraldleizhang";
+  };
+
+  users.users.leochanj = {
+    isNormalUser = true;
+    extraGroups = [ "wheel" "docker" ];
+    openssh.authorizedKeys.keys = utils.githubSSHKeys "leochanj105";
+  };
+
+  users.users.leons = {
+    isNormalUser = true;
+    extraGroups = [ "wheel" ];
+    openssh.authorizedKeys.keys = utils.githubSSHKeys "lschuermann";
+  };
+}