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/2configs') 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.2.3 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/2configs') 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.2.3