From 7c1f36ca1bafb4b415a5c9423842d6bef0102813 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Sat, 26 Aug 2017 20:03:57 +0200
Subject: requests2 -> requsts

---
 krebs/2configs/shack/muell_caller.nix    | 2 +-
 krebs/2configs/shack/radioactive.nix     | 2 +-
 krebs/2configs/shack/worlddomination.nix | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'krebs/2configs')

diff --git a/krebs/2configs/shack/muell_caller.nix b/krebs/2configs/shack/muell_caller.nix
index 2d8d78e33..a39d0cc02 100644
--- a/krebs/2configs/shack/muell_caller.nix
+++ b/krebs/2configs/shack/muell_caller.nix
@@ -12,7 +12,7 @@ let
     buildInputs = [
       (pkgs.python3.withPackages (pythonPackages: with pythonPackages; [
         docopt
-        requests2
+        requests
         paramiko
         python
       ]))
diff --git a/krebs/2configs/shack/radioactive.nix b/krebs/2configs/shack/radioactive.nix
index 378b54056..566146d6e 100644
--- a/krebs/2configs/shack/radioactive.nix
+++ b/krebs/2configs/shack/radioactive.nix
@@ -12,7 +12,7 @@ let
     buildInputs = [
       (pkgs.python3.withPackages (pythonPackages: with pythonPackages; [
         docopt
-        requests2
+        requests
         python
       ]))
     ];
diff --git a/krebs/2configs/shack/worlddomination.nix b/krebs/2configs/shack/worlddomination.nix
index d0f9f5fa6..828b6cd70 100644
--- a/krebs/2configs/shack/worlddomination.nix
+++ b/krebs/2configs/shack/worlddomination.nix
@@ -37,7 +37,7 @@ let
         docopt
         LinkHeader
         aiocoap
-        requests2
+        requests
         paramiko
         python
       ]))
-- 
cgit v1.2.3


From d973c779eb71749af464edb1ed0216b0d5317eb2 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Wed, 13 Sep 2017 21:45:42 +0200
Subject: gitlab-runner: configText -> configFile

---
 krebs/2configs/gitlab-runner-shackspace.nix | 27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)

(limited to 'krebs/2configs')

diff --git a/krebs/2configs/gitlab-runner-shackspace.nix b/krebs/2configs/gitlab-runner-shackspace.nix
index d9b4cd589..f4247b6da 100644
--- a/krebs/2configs/gitlab-runner-shackspace.nix
+++ b/krebs/2configs/gitlab-runner-shackspace.nix
@@ -1,4 +1,4 @@
-{ config, ... }:
+{ config, pkgs, ... }:
 let
   url = "https://git.shackspace.de/";
   # generate token from CI-token via:
@@ -6,7 +6,7 @@ let
   ## cat /etc/gitlab-runner/config.toml
   token = import <secrets/shackspace-gitlab-ci-token.nix> ;
 in {
-  systemd.services.gitlab-runner.path = [ 
+  systemd.services.gitlab-runner.path = [
     "/run/wrappers" # /run/wrappers/bin/su
     "/" # /bin/sh
   ];
@@ -16,19 +16,18 @@ in {
     enable = true;
     # configFile, configOptions and gracefulTimeout not yet in stable
     # gracefulTimeout = "120min";
-    configText = ''
-    concurrent = 1
-    check_interval = 0
-
-    [[runners]]
-      name = "krebs-shell"
-      url = "${url}"
-      token = "${token}"
-      executor = "shell"
-      shell = "sh"
-      environment = ["PATH=/bin:/run/wrappers/bin:/etc/per-user/gitlab-runner/bin:/etc/per-user-pkgs/gitlab-runner/bin:/nix/var/nix/profiles/default/bin:/run/current-system/sw/bin"]
-      [runners.cache]
+    configFile = pkgs.writeText "gitlab-runner.cfg" ''
+      concurrent = 1
+      check_interval = 0
 
+      [[runners]]
+        name = "krebs-shell"
+        url = "${url}"
+        token = "${token}"
+        executor = "shell"
+        shell = "sh"
+        environment = ["PATH=/bin:/run/wrappers/bin:/etc/per-user/gitlab-runner/bin:/etc/per-user-pkgs/gitlab-runner/bin:/nix/var/nix/profiles/default/bin:/run/current-system/sw/bin"]
+        [runners.cache]
     '';
   };
 }
-- 
cgit v1.2.3


From 5e51d98c4be96d992b8def3983e2a2c07cf11499 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Tue, 3 Oct 2017 21:40:21 +0200
Subject: ircd: raise default_floodcount to 1000

---
 krebs/2configs/ircd.nix | 1 +
 1 file changed, 1 insertion(+)

(limited to 'krebs/2configs')

diff --git a/krebs/2configs/ircd.nix b/krebs/2configs/ircd.nix
index 116337733..38f58952e 100644
--- a/krebs/2configs/ircd.nix
+++ b/krebs/2configs/ircd.nix
@@ -92,6 +92,7 @@
       };
       general {
         #maybe we want ident someday?
+        default_floodcount = 1000;
         disable_auth = yes;
         throttle_duration = 1;
         throttle_count = 1000;
-- 
cgit v1.2.3