From 5a004c891096b805f26fef818fa75227fe1d071f Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Fri, 24 Mar 2017 13:03:46 +0100
Subject: m 1 wry: mv Reaktor to omo

---
 makefu/1systems/wry.nix | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

(limited to 'makefu/1systems/wry.nix')

diff --git a/makefu/1systems/wry.nix b/makefu/1systems/wry.nix
index 2457ab92..c403d235 100644
--- a/makefu/1systems/wry.nix
+++ b/makefu/1systems/wry.nix
@@ -33,18 +33,6 @@ in {
 
   krebs.build.host = config.krebs.hosts.wry;
 
-  krebs.Reaktor.reaktor = {
-    nickname = "Reaktor|bot";
-    channels = [ "#krebs" "#shackspace" "#binaergewitter" ];
-    plugins = with pkgs.ReaktorPlugins;[
-                               titlebot
-                               # stockholm-issue
-                               nixos-version
-                               shack-correct
-                               sed-plugin
-                               random-emoji ];
-  };
-
   # prepare graphs
   services.nginx.enable = true;
   krebs.retiolum-bootstrap.enable = true;
@@ -64,7 +52,7 @@ in {
             return 403;
           }
         '';
-        serverAliases = [  "graphs.retiolum" "graphs.wry" "graphs.retiolum" "graphs.wry.retiolum" ];
+        serverAliases = [  "graphs.r" "graphs.retiolum" "graphs.wry" "graphs.retiolum" "graphs.wry.retiolum" ];
       };
       anonymous = {
         enableSSL = true;
-- 
cgit v1.2.3


From 9224e9c4c8432ce8d7788592b9d25cfc29440ee6 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Tue, 11 Apr 2017 21:38:27 +0200
Subject: m: gum takes over euer,wiki,graphs from wry

---
 makefu/1systems/wry.nix | 27 ---------------------------
 1 file changed, 27 deletions(-)

(limited to 'makefu/1systems/wry.nix')

diff --git a/makefu/1systems/wry.nix b/makefu/1systems/wry.nix
index c403d235..a5c4d3cc 100644
--- a/makefu/1systems/wry.nix
+++ b/makefu/1systems/wry.nix
@@ -19,8 +19,6 @@ in {
       ../2configs/backup.nix
 
       # other nginx
-      ../2configs/nginx/euer.wiki.nix
-      ../2configs/nginx/euer.blog.nix
       # ../2configs/nginx/euer.test.nix
 
       # collectd
@@ -36,31 +34,6 @@ in {
   # prepare graphs
   services.nginx.enable = true;
   krebs.retiolum-bootstrap.enable = true;
-  krebs.bepasty.servers."paste.r".nginx.extraConfig = ''
-    if ( $server_addr = "${external-ip}" ) {
-      return 403;
-    }
-  '';
-  krebs.tinc_graphs = {
-    enable = true;
-    nginx = {
-      enable = true;
-      # TODO: remove hard-coded hostname
-      complete = {
-        extraConfig = ''
-          if ( $server_addr = "${external-ip}" ) {
-            return 403;
-          }
-        '';
-        serverAliases = [  "graphs.r" "graphs.retiolum" "graphs.wry" "graphs.retiolum" "graphs.wry.retiolum" ];
-      };
-      anonymous = {
-        enableSSL = true;
-        forceSSL = true;
-        enableACME = true;
-      };
-    };
-  };
 
   networking = {
     firewall = {
-- 
cgit v1.2.3