From 644419b61108df5a84b0c7263411e364ce27bb3c Mon Sep 17 00:00:00 2001 From: lassulus Date: Wed, 26 Jul 2017 00:13:23 +0200 Subject: l buildbot: hostname agnostic --- lass/2configs/buildbot-standalone.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'lass') diff --git a/lass/2configs/buildbot-standalone.nix b/lass/2configs/buildbot-standalone.nix index 7f0a3bff1..18fd9bb92 100644 --- a/lass/2configs/buildbot-standalone.nix +++ b/lass/2configs/buildbot-standalone.nix @@ -9,9 +9,11 @@ let ControlPersist 4h ''; + hostname = config.networking.hostName; + in { config.services.nginx.virtualHosts.build = { - serverAliases = [ "build.prism.r" ]; + serverAliases = [ "build.${hostname}.r" ]; locations."/".extraConfig = '' proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection "upgrade"; @@ -20,7 +22,7 @@ in { }; config.krebs.buildbot.master = let - stockholm-mirror-url = http://cgit.prism.r/stockholm ; + stockholm-mirror-url = "http://cgit.${hostname}.r/stockholm"; in { slaves = { testslave = "lasspass"; @@ -109,13 +111,13 @@ in { web.enable = true; irc = { enable = true; - nick = "buildbot-lass"; + nick = "build|${hostname}"; server = "ni.r"; channels = [ "retiolum" "noise" ]; allowForce = true; }; extraConfig = '' - c['buildbotURL'] = "http://build.prism.r/" + c['buildbotURL'] = "http://build.${hostname}.r/" ''; }; -- cgit v1.3.1 From 05a8c6071df65c5d7f42fbef652466e02ecbb748 Mon Sep 17 00:00:00 2001 From: lassulus Date: Wed, 26 Jul 2017 00:29:32 +0200 Subject: l exim-smarthost: add nix@lassul.us --- lass/2configs/exim-smarthost.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'lass') diff --git a/lass/2configs/exim-smarthost.nix b/lass/2configs/exim-smarthost.nix index fd2f1f765..942653bab 100644 --- a/lass/2configs/exim-smarthost.nix +++ b/lass/2configs/exim-smarthost.nix @@ -34,6 +34,7 @@ with import ; { from = "irgendwas@lassul.us"; to = lass.mail; } { from = "polo@lassul.us"; to = lass.mail; } { from = "shack@lassul.us"; to = lass.mail; } + { from = "nix@lassul.us"; to = lass.mail; } ]; system-aliases = [ { from = "mailer-daemon"; to = "postmaster"; } -- cgit v1.3.1 From 38810e7a2988deb6f360f2d7d020e3038c2e510a Mon Sep 17 00:00:00 2001 From: lassulus Date: Fri, 28 Jul 2017 12:02:29 +0200 Subject: add host: daedalus --- krebs/3modules/lass/default.nix | 26 ++++++++++++++++++++++++++ lass/1systems/daedalus/config.nix | 35 +++++++++++++++++++++++++++++++++++ lass/1systems/daedalus/source.nix | 4 ++++ 3 files changed, 65 insertions(+) create mode 100644 lass/1systems/daedalus/config.nix create mode 100644 lass/1systems/daedalus/source.nix (limited to 'lass') diff --git a/krebs/3modules/lass/default.nix b/krebs/3modules/lass/default.nix index 139f02ddd..2e257b8a3 100644 --- a/krebs/3modules/lass/default.nix +++ b/krebs/3modules/lass/default.nix @@ -276,6 +276,32 @@ with import ; ssh.privkey.path = ; ssh.pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOPgQIMYiyD4/Co+nlOQWEzCKssemOEXAY/lbIZZaMhj"; }; + daedalus = { + cores = 2; + nets = rec { + retiolum = { + ip4.addr = "10.243.133.115"; + ip6.addr = "42:0:0:0:0:0:daed:a105"; + aliases = [ + "daedalus.r" + "cgit.daedalus.r" + ]; + tinc.pubkey = '' + -----BEGIN RSA PUBLIC KEY----- + MIIBCgKCAQEAzlIJfYIoQGXishIQGFNOcaVoeelqy7a731FJ+VfrqeR8WURQ6D+8 + 5hz7go+l3Z7IhTc/HbpGFJ5QJJNFSuSpLfZVyi+cKAUVheTivIniHFIRw37JbJ4+ + qWTlVe3uvOiZ0cA9S6LrbzqAUTLbH0JlWj36mvGIPICDr9YSEkIUKbenxjJlIpX8 + ECEBm8RU1aq3PUo/cVjmpqircynVJBbRCXZiHoxyLXNmh23d0fCPCabEYWhJhgaR + arkYRls5A14HGMI52F3ehnhED3k0mU8/lb4OzYgk34FjuZGmyRWIfrEKnqL4Uu2w + 3pmEvswG1WYG/3+YE80C5OpCE4BUKAzYSwIDAQAB + -----END RSA PUBLIC KEY----- + ''; + }; + }; + secure = true; + ssh.privkey.path = ; + ssh.pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAq5Ovdcsljr5dOl7+2sQNKpGpdX0SlOIuCZKEiWEp8g"; + }; iso = { cores = 1; managed = false; diff --git a/lass/1systems/daedalus/config.nix b/lass/1systems/daedalus/config.nix new file mode 100644 index 000000000..290d8a780 --- /dev/null +++ b/lass/1systems/daedalus/config.nix @@ -0,0 +1,35 @@ +{ config, pkgs, ... }: + +{ + imports = [ + + + + + + + + + + + + + + + ]; + + krebs.build.host = config.krebs.hosts.daedalus; + + fileSystems = { + "/bku" = { + device = "/dev/mapper/pool-bku"; + fsType = "btrfs"; + options = ["defaults" "noatime" "ssd" "compress=lzo"]; + }; + }; + + services.udev.extraRules = '' + SUBSYSTEM=="net", ATTR{address}=="00:24:d7:f0:e8:c8", NAME="wl0" + SUBSYSTEM=="net", ATTR{address}=="f0:de:f1:8f:8a:78", NAME="et0" + ''; +} diff --git a/lass/1systems/daedalus/source.nix b/lass/1systems/daedalus/source.nix new file mode 100644 index 000000000..a15ac80c2 --- /dev/null +++ b/lass/1systems/daedalus/source.nix @@ -0,0 +1,4 @@ +import { + name = "daedalus"; + secure = true; +} -- cgit v1.3.1 From 09475b257fa2792474ad6fb856e43b7f4e04d526 Mon Sep 17 00:00:00 2001 From: lassulus Date: Fri, 28 Jul 2017 12:46:06 +0200 Subject: l boot: add stock-x220 --- lass/2configs/boot/stock-x220.nix | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 lass/2configs/boot/stock-x220.nix (limited to 'lass') diff --git a/lass/2configs/boot/stock-x220.nix b/lass/2configs/boot/stock-x220.nix new file mode 100644 index 000000000..54a382db7 --- /dev/null +++ b/lass/2configs/boot/stock-x220.nix @@ -0,0 +1,8 @@ +{ ... }: + +{ + boot = { + loader.systemd-boot.enable = true; + loader.efi.canTouchEfiVariables = true; + }; +} -- cgit v1.3.1