Mic92/stockholm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'lass/master'

Browse Source
This commit is contained in:
makefu 2017-10-01 14:28:54 +02:00
commit cfad74494e
No known key found for this signature in database
GPG Key ID: 36F7711F3FC0F225
9 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
krebs/2configs/repo-sync.nix
View File

@ -15,8 +15,8 @@ let
post-receive = pkgs.git-hooks.irc-announce { post-receive = pkgs.git-hooks.irc-announce {
nick = config.networking.hostName; nick = config.networking.hostName;
verbose = false; verbose = false;
channel = "#retiolum"; channel = "#xxx";
server = "ni.r"; server = "irc.r";
branches = [ "master" ]; branches = [ "master" ];
}; };
}); });

4
krebs/3modules/announce-activation.nix
View File

@ -35,7 +35,7 @@ in {
irc = { irc = {
# TODO rename channel to target? # TODO rename channel to target?
channel = mkOption { channel = mkOption {
default = "#retiolum"; default = "#xxx";
type = types.str; # TODO types.irc-channel type = types.str; # TODO types.irc-channel
}; };
nick = mkOption { nick = mkOption {
@ -47,7 +47,7 @@ in {
type = types.int; type = types.int;
}; };
server = mkOption { server = mkOption {
default = "ni.r"; default = "irc.r";
type = types.hostname; type = types.hostname;
}; };
}; };

4
krebs/3modules/ci.nix
View File

@ -133,8 +133,8 @@ in
irc = { irc = {
enable = true; enable = true;
nick = "build|${hostname}"; nick = "build|${hostname}";
server = "ni.r"; server = "irc.r";
channels = [ "retiolum" "noise" ]; channels = [ "xxx" "noise" ];
allowForce = true; allowForce = true;
}; };
extraConfig = '' extraConfig = ''

8
lass/2configs/git.nix
View File

@ -77,8 +77,8 @@ let
post-receive = pkgs.git-hooks.irc-announce { post-receive = pkgs.git-hooks.irc-announce {
# TODO make nick = config.krebs.build.host.name the default # TODO make nick = config.krebs.build.host.name the default
nick = config.krebs.build.host.name; nick = config.krebs.build.host.name;
channel = "#retiolum"; channel = "#xxx";
server = "ni.r"; server = "irc.r";
verbose = config.krebs.build.host.name == "prism"; verbose = config.krebs.build.host.name == "prism";
# TODO define branches in some kind of option per repo # TODO define branches in some kind of option per repo
branches = [ "master" "staging*" ]; branches = [ "master" "staging*" ];
@ -98,8 +98,8 @@ let
post-receive = pkgs.git-hooks.irc-announce { post-receive = pkgs.git-hooks.irc-announce {
# TODO make nick = config.krebs.build.host.name the default # TODO make nick = config.krebs.build.host.name the default
nick = config.krebs.build.host.name; nick = config.krebs.build.host.name;
channel = "#retiolum"; channel = "#xxx";
server = "ni.r"; server = "irc.r";
verbose = true; verbose = true;
# TODO define branches in some kind of option per repo # TODO define branches in some kind of option per repo
branches = [ "master" "staging*" ]; branches = [ "master" "staging*" ];

2
lass/2configs/monitoring/monit-alarms.nix
View File

@ -6,7 +6,7 @@ let
set -euf set -euf
export LOGNAME=prism-alarm export LOGNAME=prism-alarm
${pkgs.irc-announce}/bin/irc-announce \ ${pkgs.irc-announce}/bin/irc-announce \
ni.r 6667 ${config.networking.hostName}-alarm \#noise "${msg}" >/dev/null irc.r 6667 ${config.networking.hostName}-alarm \#noise "${msg}" >/dev/null
''; '';
in { in {

2
lass/2configs/monitoring/server.nix
View File

@ -29,7 +29,7 @@ with import <stockholm/lib>;
data="$(${pkgs.jq}/bin/jq -r .message)" data="$(${pkgs.jq}/bin/jq -r .message)"
export LOGNAME=prism-alarm export LOGNAME=prism-alarm
${pkgs.irc-announce}/bin/irc-announce \ ${pkgs.irc-announce}/bin/irc-announce \
ni.r 6667 prism-alarm \#noise "$data" >/dev/null irc.r 6667 prism-alarm \#noise "$data" >/dev/null
''; '';
in { in {
enable = true; enable = true;

4
lass/2configs/reaktor-retiolum.nix
View File

@ -4,9 +4,9 @@ with import <stockholm/lib>;
{ {
krebs.Reaktor.retiolum = { krebs.Reaktor.retiolum = {
nickname = "Reaktor|lass"; nickname = "Reaktor|lass";
channels = [ "#retiolum" ]; channels = [ "#xxx" ];
extraEnviron = { extraEnviron = {
REAKTOR_HOST = "ni.r"; REAKTOR_HOST = "irc.r";
}; };
plugins = with pkgs.ReaktorPlugins; [ plugins = with pkgs.ReaktorPlugins; [
sed-plugin sed-plugin

4
lass/2configs/repo-sync.nix
View File

@ -15,8 +15,8 @@ let
post-receive = pkgs.git-hooks.irc-announce { post-receive = pkgs.git-hooks.irc-announce {
nick = config.networking.hostName; nick = config.networking.hostName;
verbose = false; verbose = false;
channel = "#retiolum"; channel = "#xxx";
server = "ni.r"; server = "irc.r";
branches = [ "newest" ]; branches = [ "newest" ];
}; };
}); });

4
tv/2configs/gitrepos.nix
View File

@ -100,10 +100,10 @@ let {
); );
irc-announce = args: pkgs.git-hooks.irc-announce (recursiveUpdate { irc-announce = args: pkgs.git-hooks.irc-announce (recursiveUpdate {
channel = "#retiolum"; channel = "#krebs";
# TODO make nick = config.krebs.build.host.name the default # TODO make nick = config.krebs.build.host.name the default
nick = config.krebs.build.host.name; nick = config.krebs.build.host.name;
server = "ni.r"; server = "irc.r";
verbose = true; verbose = true;
} args); } args);