summaryrefslogtreecommitdiffstats
path: root/lass/2configs
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2017-07-28 13:31:15 +0200
committermakefu <github@syntax-fehler.de>2017-07-28 13:31:15 +0200
commit44e521a5745807f4c19e7c56b9f4d0266f89b3e4 (patch)
tree11396e2c39d251ceb1018f34f2cc5a38bd722459 /lass/2configs
parent421c27332a69708afd81a5fb07a28fdc93449338 (diff)
parente8148b62fdb39ed76361da5b7a6de88a8f800073 (diff)
Merge remote-tracking branch 'lass/master'
Diffstat (limited to 'lass/2configs')
-rw-r--r--lass/2configs/boot/stock-x220.nix8
-rw-r--r--lass/2configs/buildbot-standalone.nix10
-rw-r--r--lass/2configs/exim-smarthost.nix1
3 files changed, 15 insertions, 4 deletions
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;
+ };
+}
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/"
'';
};
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 <stockholm/lib>;
{ 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"; }