4 files changed, 3 insertions, 88 deletions
diff --git a/makefu/2configs/deployment/mycube.connector.one.nix b/makefu/2configs/deployment/mycube.connector.one.nix
index 379176f7..aa9ff514 100644
--- a/makefu/2configs/deployment/mycube.connector.one.nix
+++ b/makefu/2configs/deployment/mycube.connector.one.nix
@@ -1,15 +1,12 @@
 { config, lib, pkgs, ... }:
 # more than just nginx config but not enough to become a module
-with import <stockholm/lib>;
 let
   hostname = config.krebs.build.host.name;
   external-ip = config.krebs.build.host.nets.internet.ip4.addr;
   wsgi-sock = "${config.services.uwsgi.runDir}/uwsgi.sock";
 in {
-  services.redis = {
-    enable = true;
-  };
-  systemd.services.redis.serviceConfig.LimitNOFILE=10032;
+  services.redis = { enable = true; };
+  systemd.services.redis.serviceConfig.LimitNOFILE=65536;
 
   services.uwsgi = {
     enable = true;
@@ -28,7 +25,7 @@ in {
   };
 
   services.nginx = {
-    enable = mkDefault true;
+    enable = lib.mkDefault true;
     virtualHosts."mybox.connector.one" = {
         locations = {
           "/".extraConfig = ''
diff --git a/makefu/2configs/deployment/newsbot.nix b/makefu/2configs/deployment/newsbot.nix
deleted file mode 100644
index 74880344..00000000
--- a/makefu/2configs/deployment/newsbot.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{ config, pkgs, ... }:
-
-let
-  newsfile = pkgs.writeText "feeds" ''
-    nixoswiki-bot|https://github.com/Mic92/nixos-wiki/wiki.atom|#krebs
-  '';
-in {
-  environment.systemPackages = [
-    pkgs.newsbot-js
-  ];
-  krebs.newsbot-js = {
-    enable = true;
-    ircServer = "chat.freenode.net";
-    feeds = newsfile;
-    urlShortenerHost = "go";
-    urlShortenerPort = "80";
-  };
-}
diff --git a/makefu/2configs/deployment/wiki-irc-bot/default.nix b/makefu/2configs/deployment/wiki-irc-bot/default.nix
deleted file mode 100644
index 12686efb..00000000
--- a/makefu/2configs/deployment/wiki-irc-bot/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{ config, pkgs, ... }:
-
-let
-  pkg = pkgs.lib.overrideDerivation pkgs.newsbot-js (original: {
-    patches = [ ./wiki-output.patch ];
-  });
-  newsfile = pkgs.writeText "feeds" ''
-    nixoswiki-bot|https://nixos.wiki/api.php?days=7&limit=50&hidecategorization=1&action=feedrecentchanges&feedformat=rss|#krebs
-  '';
-in {
-  krebs.newsbot-js = {
-    enable = true;
-    package = pkg;
-    ircServer = "chat.freenode.net";
-    feeds = newsfile;
-    urlShortenerHost = "go";
-    urlShortenerPort = "80";
-  };
-}
diff --git a/makefu/2configs/deployment/wiki-irc-bot/wiki-output.patch b/makefu/2configs/deployment/wiki-irc-bot/wiki-output.patch
deleted file mode 100644
index 6e1e2785..00000000
--- a/makefu/2configs/deployment/wiki-irc-bot/wiki-output.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff --git a/newsbot.js b/newsbot.js
-index 42d0666..a284011 100644
---- a/newsbot.js
-+++ b/newsbot.js
-@@ -92,8 +92,9 @@ function create_feedbot (nick, uri, channels) {
-   }
- 
-   function broadcast_new_item (item) {
-+    console.log('Broadcasting item ',item.link)
-     return getShortLink(item.link, function (error, shortlink) {
--      return broadcast(item.title + ' ' + shortlink)
-+      return broadcast('"'+ item.title + '" edited by ' + item.author +  ' ' + shortlink)
-     })
-   }
-   
-@@ -152,15 +153,18 @@ function create_feedbot (nick, uri, channels) {
- 
-       if (client.lastItems) {
-         items.forEach(function (item) {
--          if (!client.lastItems.hasOwnProperty(item.title)) {
-+
-+          if (!client.lastItems.hasOwnProperty(item.guid)) {
-             broadcast_new_item(item)
-+          }else {
-+            console.log("Item already seen:",item.guid)
-           }
-         })
-       }
- 
-       client.lastItems = {}
-       items.forEach(function (item) {
--        client.lastItems[item.title] = true
-+        client.lastItems[item.guid] = true
-       })
- 
-       return continue_loop()
-@@ -199,6 +203,8 @@ function run_command (methodname, params, callback) {
- }
- 
- function getShortLink (link, callback) {
-+  callback(null,link)
-+  return
-   var form = new FormData()
-   try {
-     form.append('uri', link)