From 9c49d9a4396099653ca417cadf0208987de1a779 Mon Sep 17 00:00:00 2001 From: lassulus Date: Wed, 12 Apr 2017 12:15:15 +0200 Subject: l 2 buildbot: use prism.r --- lass/2configs/buildbot-standalone.nix | 3 +++ 1 file changed, 3 insertions(+) (limited to 'lass') diff --git a/lass/2configs/buildbot-standalone.nix b/lass/2configs/buildbot-standalone.nix index 2bd3e9914..44ee37ca9 100644 --- a/lass/2configs/buildbot-standalone.nix +++ b/lass/2configs/buildbot-standalone.nix @@ -219,6 +219,9 @@ in { channels = [ { channel = "retiolum"; } { channel = "noise"; } ]; allowForce = true; }; + extraConfig = '' + c['buildbotURL'] = "http://${config.networking.hostName}.r:${toString config.krebs.buildbot.master.web.port}/" + ''; }; config.krebs.buildbot.worker = { -- cgit v1.2.3 From c9ef03188c0cc5a7dcf145690087813e18ec1c88 Mon Sep 17 00:00:00 2001 From: lassulus Date: Wed, 12 Apr 2017 17:57:26 +0200 Subject: l 5 logify: init --- lass/5pkgs/default.nix | 1 + lass/5pkgs/logify/default.nix | 7 +++++++ 2 files changed, 8 insertions(+) create mode 100644 lass/5pkgs/logify/default.nix (limited to 'lass') 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 +'' -- cgit v1.2.3 From 894192ea104a0d7e84db848afdf2c1fe12b72d21 Mon Sep 17 00:00:00 2001 From: lassulus Date: Wed, 12 Apr 2017 21:05:18 +0200 Subject: l 2 buildbot: change buildbotURL to build.prism.r --- lass/2configs/buildbot-standalone.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'lass') diff --git a/lass/2configs/buildbot-standalone.nix b/lass/2configs/buildbot-standalone.nix index 44ee37ca9..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 { @@ -220,7 +229,7 @@ in { allowForce = true; }; extraConfig = '' - c['buildbotURL'] = "http://${config.networking.hostName}.r:${toString config.krebs.buildbot.master.web.port}/" + c['buildbotURL'] = "http://build.prism.r/" ''; }; @@ -237,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"; } ]; }; -- cgit v1.2.3 From 22edcfcb72dc0b728a96ab92ecca8944b81c13d0 Mon Sep 17 00:00:00 2001 From: lassulus Date: Wed, 12 Apr 2017 21:05:42 +0200 Subject: l 2: change search-domain to .r --- lass/2configs/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lass') 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 ; krebs = { enable = true; - search-domain = "retiolum"; + search-domain = "r"; build = { user = config.krebs.users.lass; source = let inherit (config.krebs.build) host; in { -- cgit v1.2.3