From 847fc54141fc6bfbdcc4fe05c3d25edcc34f15ef Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Wed, 24 May 2017 10:53:08 +0200
Subject: [PATCH] m 2 wiki-irc-bot: move to subdir, add patch

---
 .../default.nix}                              |  7 ++++-
 .../wiki-irc-bot/irc-out-notice.patch         | 26 +++++++++++++++++++
 2 files changed, 32 insertions(+), 1 deletion(-)
 rename 2configs/deployment/{wiki-irc.nix => wiki-irc-bot/default.nix} (85%)
 create mode 100644 2configs/deployment/wiki-irc-bot/irc-out-notice.patch

diff --git a/2configs/deployment/wiki-irc.nix b/2configs/deployment/wiki-irc-bot/default.nix
similarity index 85%
rename from 2configs/deployment/wiki-irc.nix
rename to 2configs/deployment/wiki-irc-bot/default.nix
index dc7c8af..7ab31e6 100644
--- a/2configs/deployment/wiki-irc.nix
+++ b/2configs/deployment/wiki-irc-bot/default.nix
@@ -4,6 +4,10 @@ with lib;
 let
   port = 18872;
 in {
+  nixpkgs.config.packageOverrides = pkgs: with pkgs; {
+    logstash = pkgs.stdenv.lib.overrideDerivation  pkgs.logstash (old: {
+      patches = [ ./irc-out-notice.patch ]; });
+  };
   services.logstash = {
     enable = true;
     inputConfig = ''
@@ -40,10 +44,11 @@ in {
       file { path => "/tmp/logs.json" codec => "json_lines" }
       if [output] {
         irc {
-          channels => [ "#nixos" , "#krebs" ]
+          channels => [ "#krebs", "#nixos" ]
           host => "irc.freenode.net"
           nick => "nixos-users-wiki"
           format => "%{output}"
+          notice => true
         }
       }
     '';
diff --git a/2configs/deployment/wiki-irc-bot/irc-out-notice.patch b/2configs/deployment/wiki-irc-bot/irc-out-notice.patch
new file mode 100644
index 0000000..040643f
--- /dev/null
+++ b/2configs/deployment/wiki-irc-bot/irc-out-notice.patch
@@ -0,0 +1,26 @@
+index b63339d..8c8c747 100644
+--- a/vendor/bundle/jruby/1.9/gems/logstash-output-irc-2.0.4/lib/logstash/outputs/irc.rb
++++ b/vendor/bundle/jruby/1.9/gems/logstash-output-irc-2.0.4/lib/logstash/outputs/irc.rb
+@@ -48,6 +48,9 @@ class LogStash::Outputs::Irc < LogStash::Outputs::Base
+   # Static string after event
+   config :post_string, :validate => :string, :required => false
+ 
++  # Set this to true to send messages as notice
++  config :notice, :validate => :boolean, :default => false
++
+   public
+ 
+   def inject_bot(bot)
+@@ -90,9 +93,9 @@ class LogStash::Outputs::Irc < LogStash::Outputs::Base
+ 
+     @bot.channels.each do |channel|
+       @logger.debug("Sending to...", :channel => channel, :text => text)
+-      channel.msg(pre_string) if !@pre_string.nil?
+-      channel.msg(text)
+-      channel.msg(post_string) if !@post_string.nil?
++      channel.send(pre_string, :notice => @notice) if !@pre_string.nil?
++      channel.send(text, :notice => @notice)
++      channel.send(post_string, :notice => @notice) if !@post_string.nil?
+     end # channels.each
+   end # def receive
+ end # class LogStash::Outputs::Irc