Merge branch 'master' of gum:stockholm into fix-cert

This commit is contained in:
makefu 2016-01-22 11:35:00 +01:00
commit b0f7eb47dc
7 changed files with 60 additions and 3 deletions

View File

@ -297,6 +297,30 @@ with lib;
ssh.privkey.path = <secrets/ssh_host_ed25519_key>; ssh.privkey.path = <secrets/ssh_host_ed25519_key>;
ssh.pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIujMZ3ZFxKpWeB/cjfKfYRr77+VRZk0Eik+92t03NoA root@servarch"; ssh.pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIujMZ3ZFxKpWeB/cjfKfYRr77+VRZk0Eik+92t03NoA root@servarch";
}; };
wbob = rec {
cores = 1;
dc = "none";
nets = {
retiolm = {
addrs4 = ["10.243.214.15/32"];
addrs6 = ["42:5a02:2c30:c1b1:3f2e:7c19:2496:a732/128"];
aliases = [
"wbob.retiolum"
];
tinc.pubkey = ''
-----BEGIN RSA PUBLIC KEY-----
MIIBCgKCAQEAqLTJx91OdR0FlJAc2JGh+AJde95oMzzh8o36JBFpsaN7styNfD3e
QGM/bDXFjk4ieIe5At0Z63P2KWxRp3cz8LWKJsn5cGsX2074YWMAGmKX+ZZJNlal
cJ994xX+8MJ6L2tVKpY7Ace7gqDN+l650PrEzV2SLisIqOdxoBlbAupdwHieUBt8
khm4NLNUCxPYUx2RtHn4iGdgSgUD/SnyHEFdyDA17lWAGfEi4yFFjFMYQce/TFrs
rQV9t5hGaofu483Epo6mEfcBcsR4GIHI4a4WKYANsIyvFvzyGFEHOMusG6nRRqE9
TNs2RYfwDy/r6H/hDeB/BSngPouedEVcPwIDAQAB
-----END RSA PUBLIC KEY-----
'';
};
};
};
gum = rec { gum = rec {
cores = 1; cores = 1;
dc = "online.net"; #root-server dc = "online.net"; #root-server

View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "apt-cacher-ng-${version}"; name = "apt-cacher-ng-${version}";
version = "0.8.6"; version = "0.8.8";
src = fetchurl { src = fetchurl {
url = "http://ftp.debian.org/debian/pool/main/a/apt-cacher-ng/apt-cacher-ng_${version}.orig.tar.xz"; url = "http://ftp.debian.org/debian/pool/main/a/apt-cacher-ng/apt-cacher-ng_${version}.orig.tar.xz";
sha256 = "0044dfks8djl11fs28jj8894i4rq424xix3d3fkvzz2i6lnp8nr5"; sha256 = "0n7yy4h8g7j0g94xngbywmfhrkg9xl3j2c4wzrjknfwvxmqgjivq";
}; };
NIX_LDFLAGS = "-lpthread"; NIX_LDFLAGS = "-lpthread";

10
krebs/Zhosts/wbob Normal file
View File

@ -0,0 +1,10 @@
Subnet = 10.243.214.15/32
Subnet = 42:5a02:2c30:c1b1:3f2e:7c19:2496:a732/128
-----BEGIN RSA PUBLIC KEY-----
MIIBCgKCAQEAqLTJx91OdR0FlJAc2JGh+AJde95oMzzh8o36JBFpsaN7styNfD3e
QGM/bDXFjk4ieIe5At0Z63P2KWxRp3cz8LWKJsn5cGsX2074YWMAGmKX+ZZJNlal
cJ994xX+8MJ6L2tVKpY7Ace7gqDN+l650PrEzV2SLisIqOdxoBlbAupdwHieUBt8
khm4NLNUCxPYUx2RtHn4iGdgSgUD/SnyHEFdyDA17lWAGfEi4yFFjFMYQce/TFrs
rQV9t5hGaofu483Epo6mEfcBcsR4GIHI4a4WKYANsIyvFvzyGFEHOMusG6nRRqE9
TNs2RYfwDy/r6H/hDeB/BSngPouedEVcPwIDAQAB
-----END RSA PUBLIC KEY-----

19
makefu/1systems/wbob.nix Normal file
View File

@ -0,0 +1,19 @@
{ config, pkgs, ... }:
{
imports =
[ # Include the results of the hardware scan.
../2configs/main-laptop.nix
];
krebs = {
enable = true;
retiolum.enable = true;
build.host = config.krebs.hosts.wbob;
};
boot.loader.grub.device = "/dev/sda";
boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "usbhid" "usb_storage" ];
boot.kernelModules = [ "kvm-intel" ];
fileSystems."/" = {
device = "/dev/sda1";
fsType = "ext4";
};
}

View File

@ -16,6 +16,9 @@ let
desc = "Tinc Advanced Graph Generation"; desc = "Tinc Advanced Graph Generation";
}; };
cac = { }; cac = { };
init-stockholm = {
desc = "Init stuff for stockholm";
};
}; };
priv-repos = mapAttrs make-priv-repo { priv-repos = mapAttrs make-priv-repo {

View File

@ -4,7 +4,6 @@ with lib;
{ {
krebs.retiolum = { krebs.retiolum = {
enable = true; enable = true;
hosts = ../../krebs/Zhosts;
connectTo = [ connectTo = [
"gum" "gum"
"pigstarter" "pigstarter"

View File

@ -84,6 +84,7 @@
nix-instantiate --eval -A \ nix-instantiate --eval -A \
users.shared.test-all-krebs-modules.system \ users.shared.test-all-krebs-modules.system \
-I stockholm=. \ -I stockholm=. \
--show-trace \
-I secrets=. '<stockholm>' \ -I secrets=. '<stockholm>' \
--argstr current-date lol \ --argstr current-date lol \
--argstr current-user-name shared \ --argstr current-user-name shared \
@ -96,6 +97,7 @@
users.shared.test-minimal-deploy.system \ users.shared.test-minimal-deploy.system \
-I stockholm=. \ -I stockholm=. \
-I secrets=. '<stockholm>' \ -I secrets=. '<stockholm>' \
--show-trace \
--argstr current-date lol \ --argstr current-date lol \
--argstr current-user-name shared \ --argstr current-user-name shared \
--argstr current-host-name lol \ --argstr current-host-name lol \