Merge remote-tracking branch 'prism/lassulus'
This commit is contained in:
commit
bcbf11a57c
|
@ -94,6 +94,7 @@ with import <stockholm/lib>;
|
||||||
ip6.addr = "42:0000:0000:0000:0000:0000:0000:15ab";
|
ip6.addr = "42:0000:0000:0000:0000:0000:0000:15ab";
|
||||||
aliases = [
|
aliases = [
|
||||||
"prism.r"
|
"prism.r"
|
||||||
|
"build.prism.r"
|
||||||
"cgit.prism.r"
|
"cgit.prism.r"
|
||||||
"cache.prism.r"
|
"cache.prism.r"
|
||||||
"paste.r"
|
"paste.r"
|
||||||
|
|
|
@ -10,6 +10,15 @@ let
|
||||||
'';
|
'';
|
||||||
|
|
||||||
in {
|
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
|
config.krebs.buildbot.master = let
|
||||||
stockholm-mirror-url = http://cgit.lassul.us/stockholm ;
|
stockholm-mirror-url = http://cgit.lassul.us/stockholm ;
|
||||||
in {
|
in {
|
||||||
|
@ -219,6 +228,9 @@ in {
|
||||||
channels = [ { channel = "retiolum"; } { channel = "noise"; } ];
|
channels = [ { channel = "retiolum"; } { channel = "noise"; } ];
|
||||||
allowForce = true;
|
allowForce = true;
|
||||||
};
|
};
|
||||||
|
extraConfig = ''
|
||||||
|
c['buildbotURL'] = "http://build.prism.r/"
|
||||||
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
config.krebs.buildbot.worker = {
|
config.krebs.buildbot.worker = {
|
||||||
|
@ -234,7 +246,6 @@ in {
|
||||||
config.krebs.iptables = {
|
config.krebs.iptables = {
|
||||||
tables = {
|
tables = {
|
||||||
filter.INPUT.rules = [
|
filter.INPUT.rules = [
|
||||||
{ predicate = "-p tcp --dport 8010"; target = "ACCEPT"; }
|
|
||||||
{ predicate = "-p tcp --dport 9989"; target = "ACCEPT"; }
|
{ predicate = "-p tcp --dport 9989"; target = "ACCEPT"; }
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
|
@ -76,7 +76,7 @@ with import <stockholm/lib>;
|
||||||
|
|
||||||
krebs = {
|
krebs = {
|
||||||
enable = true;
|
enable = true;
|
||||||
search-domain = "retiolum";
|
search-domain = "r";
|
||||||
build = {
|
build = {
|
||||||
user = config.krebs.users.lass;
|
user = config.krebs.users.lass;
|
||||||
source = let inherit (config.krebs.build) host; in {
|
source = let inherit (config.krebs.build) host; in {
|
||||||
|
|
|
@ -12,6 +12,7 @@
|
||||||
vimperator = pkgs.callPackage ./firefoxPlugins/vimperator.nix {};
|
vimperator = pkgs.callPackage ./firefoxPlugins/vimperator.nix {};
|
||||||
};
|
};
|
||||||
init = pkgs.callPackage ./init/default.nix args;
|
init = pkgs.callPackage ./init/default.nix args;
|
||||||
|
logify = pkgs.callPackage ./logify/default.nix {};
|
||||||
mk_sql_pair = pkgs.callPackage ./mk_sql_pair/default.nix {};
|
mk_sql_pair = pkgs.callPackage ./mk_sql_pair/default.nix {};
|
||||||
mpv-poll = pkgs.callPackage ./mpv-poll/default.nix {};
|
mpv-poll = pkgs.callPackage ./mpv-poll/default.nix {};
|
||||||
pop = pkgs.callPackage ./pop/default.nix {};
|
pop = pkgs.callPackage ./pop/default.nix {};
|
||||||
|
|
7
lass/5pkgs/logify/default.nix
Normal file
7
lass/5pkgs/logify/default.nix
Normal file
|
@ -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
|
||||||
|
''
|
Loading…
Reference in New Issue
Block a user