diff options
| author | makefu <github@syntax-fehler.de> | 2017-10-07 11:08:13 +0200 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2017-10-07 11:08:13 +0200 |
| commit | 8290c6507e500c1899f4a7d1184ef5b24c8132cb (patch) | |
| tree | 91d64e1cc20647acce06f7f28da46b58e5dd2571 /tv/2configs | |
| parent | 52f9105027a7c2d70145d7d2db69452e148b2158 (diff) | |
| parent | a8db051451d2827d7c7ad38f005284013e63c039 (diff) | |
Merge remote-tracking branch 'lass/master'
Diffstat (limited to 'tv/2configs')
| -rw-r--r-- | tv/2configs/br.nix | 1 | ||||
| -rw-r--r-- | tv/2configs/gitrepos.nix | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/tv/2configs/br.nix b/tv/2configs/br.nix index c7eb20e90..d660ebc35 100644 --- a/tv/2configs/br.nix +++ b/tv/2configs/br.nix @@ -45,5 +45,4 @@ with import <stockholm/lib>; ]; }; - systemd.services.cups.serviceConfig.PrivateTmp = true; } diff --git a/tv/2configs/gitrepos.nix b/tv/2configs/gitrepos.nix index bbb1d4128..2c4b4868e 100644 --- a/tv/2configs/gitrepos.nix +++ b/tv/2configs/gitrepos.nix @@ -100,7 +100,7 @@ let { ); irc-announce = args: pkgs.git-hooks.irc-announce (recursiveUpdate { - channel = "#krebs"; + channel = "#xxx"; # TODO make nick = config.krebs.build.host.name the default nick = config.krebs.build.host.name; server = "irc.r"; |