summaryrefslogtreecommitdiffstats
path: root/krebs
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2017-07-28 22:00:25 +0200
committermakefu <github@syntax-fehler.de>2017-07-28 22:00:25 +0200
commitdfd1b5f6bc278be615975dc619e1f9490e05ef7a (patch)
tree2991cddc8933d494a8b13124bf59540fe0124c9c /krebs
parent6919ec53cc640e0b813989012eecc58665887e19 (diff)
parent32d8c202b0ec037dcf78ebf6ecad730cfb9c5272 (diff)
Merge remote-tracking branch 'lass/master'
Diffstat (limited to 'krebs')
-rw-r--r--krebs/1systems/hotdog/config.nix2
-rw-r--r--krebs/1systems/puyak/config.nix2
-rw-r--r--krebs/1systems/wolf/config.nix2
-rw-r--r--krebs/2configs/buildbot-all.nix11
-rw-r--r--krebs/2configs/buildbot-krebs.nix (renamed from krebs/2configs/shared-buildbot.nix)0
-rw-r--r--krebs/3modules/ci.nix8
-rw-r--r--krebs/3modules/fetchWallpaper.nix2
-rw-r--r--krebs/3modules/lass/default.nix3
8 files changed, 22 insertions, 8 deletions
diff --git a/krebs/1systems/hotdog/config.nix b/krebs/1systems/hotdog/config.nix
index 26f392da8..c056b4eaf 100644
--- a/krebs/1systems/hotdog/config.nix
+++ b/krebs/1systems/hotdog/config.nix
@@ -9,7 +9,7 @@
<stockholm/krebs>
<stockholm/krebs/2configs>
- <stockholm/krebs/2configs/shared-buildbot.nix>
+ <stockholm/krebs/2configs/buildbot-all.nix>
];
krebs.build.host = config.krebs.hosts.hotdog;
diff --git a/krebs/1systems/puyak/config.nix b/krebs/1systems/puyak/config.nix
index 6c950d414..a1df11901 100644
--- a/krebs/1systems/puyak/config.nix
+++ b/krebs/1systems/puyak/config.nix
@@ -7,7 +7,7 @@
<stockholm/krebs/2configs/secret-passwords.nix>
<stockholm/krebs/2configs/hw/x220.nix>
- <stockholm/krebs/2configs/shared-buildbot.nix>
+ <stockholm/krebs/2configs/buildbot-krebs.nix>
<stockholm/krebs/2configs/stats/puyak-client.nix>
];
diff --git a/krebs/1systems/wolf/config.nix b/krebs/1systems/wolf/config.nix
index e883a176d..a0113fce8 100644
--- a/krebs/1systems/wolf/config.nix
+++ b/krebs/1systems/wolf/config.nix
@@ -12,7 +12,7 @@ in
<stockholm/krebs/2configs/save-diskspace.nix>
<stockholm/krebs/2configs/graphite.nix>
- <stockholm/krebs/2configs/shared-buildbot.nix>
+ <stockholm/krebs/2configs/buildbot-krebs.nix>
<stockholm/krebs/2configs/shack/worlddomination.nix>
<stockholm/krebs/2configs/shack/drivedroid.nix>
diff --git a/krebs/2configs/buildbot-all.nix b/krebs/2configs/buildbot-all.nix
new file mode 100644
index 000000000..fe982c870
--- /dev/null
+++ b/krebs/2configs/buildbot-all.nix
@@ -0,0 +1,11 @@
+{ lib, config, pkgs, ... }:
+{
+ imports = [
+ <stockholm/krebs/2configs/buildbot-krebs.nix>
+ ];
+ krebs.ci.users.lass.all = true;
+ krebs.ci.users.makefu.all = true;
+ krebs.ci.users.nin.all = true;
+ krebs.ci.users.tv.all = true;
+}
+
diff --git a/krebs/2configs/shared-buildbot.nix b/krebs/2configs/buildbot-krebs.nix
index 7f243b506..7f243b506 100644
--- a/krebs/2configs/shared-buildbot.nix
+++ b/krebs/2configs/buildbot-krebs.nix
diff --git a/krebs/3modules/ci.nix b/krebs/3modules/ci.nix
index 542a9252f..6e4db6edd 100644
--- a/krebs/3modules/ci.nix
+++ b/krebs/3modules/ci.nix
@@ -116,8 +116,12 @@ in
"dummy_secrets": "true",
},
command=[
- "nix-shell", "--run",
- "test --user={} --system={} --target=$LOGNAME@${config.krebs.build.host.name}$HOME/{}".format(user, host, user)
+ "nix-shell", "--run", " ".join(["test",
+ "--user={}".format(user),
+ "--system={}".format(host),
+ "--force-populate",
+ "--target=$LOGNAME@${config.krebs.build.host.name}$HOME/{}".format(user),
+ ])
]
)
diff --git a/krebs/3modules/fetchWallpaper.nix b/krebs/3modules/fetchWallpaper.nix
index cdb9fe70a..8d4933cb5 100644
--- a/krebs/3modules/fetchWallpaper.nix
+++ b/krebs/3modules/fetchWallpaper.nix
@@ -51,7 +51,7 @@ let
mkdir -p ${cfg.stateDir}
chmod o+rx ${cfg.stateDir}
cd ${cfg.stateDir}
- (curl --max-time ${toString cfg.maxTime} -s -o wallpaper.tmp -z wallpaper ${shell.escape cfg.url} && mv wallpaper.tmp wallpaper) || :
+ (curl --max-time ${toString cfg.maxTime} -s -o wallpaper.tmp -z wallpaper.tmp ${shell.escape cfg.url} && cp wallpaper.tmp wallpaper) || :
feh --no-fehbg --bg-scale ${shell.escape cfg.stateDir}/wallpaper
'';
diff --git a/krebs/3modules/lass/default.nix b/krebs/3modules/lass/default.nix
index c554391f2..f0722e9ba 100644
--- a/krebs/3modules/lass/default.nix
+++ b/krebs/3modules/lass/default.nix
@@ -97,7 +97,6 @@ with import <stockholm/lib>;
aliases = [
"prism.r"
"build.prism.r"
- "cgit.prism.r"
"cache.prism.r"
"paste.r"
"p.r"
@@ -255,7 +254,7 @@ with import <stockholm/lib>;
nets = rec {
retiolum = {
ip4.addr = "10.243.133.114";
- ip6.addr = "42:0:0:0:0:0:1ca0:1205";
+ ip6.addr = "42:0:0:0:0:0:01ca:1205";
aliases = [
"icarus.r"
"cgit.icarus.r"