summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortv <tv@krebsco.de>2017-04-13 11:15:05 +0200
committertv <tv@krebsco.de>2017-04-13 11:15:05 +0200
commitbcbf11a57cd399cd6e0d707401f8f1cfb0d50eea (patch)
treeb2c42263bead615b4264c453d392edcf08025f7e
parent79bcfa03edcf7eaeb69515c99af7522f893665f4 (diff)
parent22edcfcb72dc0b728a96ab92ecca8944b81c13d0 (diff)
Merge remote-tracking branch 'prism/lassulus'
-rw-r--r--krebs/3modules/lass/default.nix1
-rw-r--r--lass/2configs/buildbot-standalone.nix13
-rw-r--r--lass/2configs/default.nix2
-rw-r--r--lass/5pkgs/default.nix1
-rw-r--r--lass/5pkgs/logify/default.nix7
5 files changed, 22 insertions, 2 deletions
diff --git a/krebs/3modules/lass/default.nix b/krebs/3modules/lass/default.nix
index db0a7005f..ec5811d86 100644
--- a/krebs/3modules/lass/default.nix
+++ b/krebs/3modules/lass/default.nix
@@ -94,6 +94,7 @@ with import <stockholm/lib>;
ip6.addr = "42:0000:0000:0000:0000:0000:0000:15ab";
aliases = [
"prism.r"
+ "build.prism.r"
"cgit.prism.r"
"cache.prism.r"
"paste.r"
diff --git a/lass/2configs/buildbot-standalone.nix b/lass/2configs/buildbot-standalone.nix
index 2bd3e9914..3006e9dfb 100644
--- a/lass/2configs/buildbot-standalone.nix
+++ b/lass/2configs/buildbot-standalone.nix
@@ -10,6 +10,15 @@ let
'';
in {
+ config.services.nginx.virtualHosts.build = {
+ serverAliases = [ "build.prism.r" ];
+ locations."/".extraConfig = ''
+ proxy_set_header Upgrade $http_upgrade;
+ proxy_set_header Connection "upgrade";
+ proxy_pass http://localhost:${toString config.krebs.buildbot.master.web.port};
+ '';
+ };
+
config.krebs.buildbot.master = let
stockholm-mirror-url = http://cgit.lassul.us/stockholm ;
in {
@@ -219,6 +228,9 @@ in {
channels = [ { channel = "retiolum"; } { channel = "noise"; } ];
allowForce = true;
};
+ extraConfig = ''
+ c['buildbotURL'] = "http://build.prism.r/"
+ '';
};
config.krebs.buildbot.worker = {
@@ -234,7 +246,6 @@ in {
config.krebs.iptables = {
tables = {
filter.INPUT.rules = [
- { predicate = "-p tcp --dport 8010"; target = "ACCEPT"; }
{ predicate = "-p tcp --dport 9989"; target = "ACCEPT"; }
];
};
diff --git a/lass/2configs/default.nix b/lass/2configs/default.nix
index b747ccb39..69f8a681e 100644
--- a/lass/2configs/default.nix
+++ b/lass/2configs/default.nix
@@ -76,7 +76,7 @@ with import <stockholm/lib>;
krebs = {
enable = true;
- search-domain = "retiolum";
+ search-domain = "r";
build = {
user = config.krebs.users.lass;
source = let inherit (config.krebs.build) host; in {
diff --git a/lass/5pkgs/default.nix b/lass/5pkgs/default.nix
index e47e3126a..e49a0442d 100644
--- a/lass/5pkgs/default.nix
+++ b/lass/5pkgs/default.nix
@@ -12,6 +12,7 @@
vimperator = pkgs.callPackage ./firefoxPlugins/vimperator.nix {};
};
init = pkgs.callPackage ./init/default.nix args;
+ logify = pkgs.callPackage ./logify/default.nix {};
mk_sql_pair = pkgs.callPackage ./mk_sql_pair/default.nix {};
mpv-poll = pkgs.callPackage ./mpv-poll/default.nix {};
pop = pkgs.callPackage ./pop/default.nix {};
diff --git a/lass/5pkgs/logify/default.nix b/lass/5pkgs/logify/default.nix
new file mode 100644
index 000000000..bca7e7971
--- /dev/null
+++ b/lass/5pkgs/logify/default.nix
@@ -0,0 +1,7 @@
+{ curl, writeDashBin }:
+
+#usage: ping 8.8.8.8 |& logify -I
+writeDashBin "logify" ''
+ date_args=''${@:--Is}
+ while read line; do echo $(date "$date_args") $line; done
+''