From f47bab7f710b7c8a282c3a3c38affc8a0bc30cc9 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Thu, 20 Oct 2016 20:54:38 +0200
Subject: drop config.krebs.lib

---
 lass/1systems/helios.nix | 2 +-
 lass/1systems/mors.nix   | 2 +-
 lass/1systems/prism.nix  | 2 +-
 lass/1systems/uriel.nix  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'lass/1systems')

diff --git a/lass/1systems/helios.nix b/lass/1systems/helios.nix
index 8ce1d5748..c16080762 100644
--- a/lass/1systems/helios.nix
+++ b/lass/1systems/helios.nix
@@ -1,7 +1,7 @@
 { config, pkgs, ... }:
 
 with builtins;
-with config.krebs.lib;
+with import <stockholm/lib>;
 
 {
   imports = [
diff --git a/lass/1systems/mors.nix b/lass/1systems/mors.nix
index 1028ca652..ae48761e7 100644
--- a/lass/1systems/mors.nix
+++ b/lass/1systems/mors.nix
@@ -1,6 +1,6 @@
 { config, pkgs, ... }:
 
-with config.krebs.lib;
+with import <stockholm/lib>;
 {
   imports = [
     ../.
diff --git a/lass/1systems/prism.nix b/lass/1systems/prism.nix
index 8b4f1d7a2..76710ac9d 100644
--- a/lass/1systems/prism.nix
+++ b/lass/1systems/prism.nix
@@ -1,6 +1,6 @@
 { config, lib, pkgs, ... }:
 
-with config.krebs.lib;
+with import <stockholm/lib>;
 
 let
   ip = config.krebs.build.host.nets.internet.ip4.addr;
diff --git a/lass/1systems/uriel.nix b/lass/1systems/uriel.nix
index e1417c83d..b84fec317 100644
--- a/lass/1systems/uriel.nix
+++ b/lass/1systems/uriel.nix
@@ -1,7 +1,7 @@
 { config, pkgs, ... }:
 
 with builtins;
-with config.krebs.lib;
+with import <stockholm/lib>;
 {
   imports = [
     ../.
-- 
cgit v1.2.3


From 7b7b7e2c8044a8a09697ded15a936fe5a76f03a7 Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Thu, 20 Oct 2016 21:05:56 +0200
Subject: l 1 mors: activate redis

---
 lass/1systems/mors.nix | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'lass/1systems')

diff --git a/lass/1systems/mors.nix b/lass/1systems/mors.nix
index ae48761e7..c3d027edc 100644
--- a/lass/1systems/mors.nix
+++ b/lass/1systems/mors.nix
@@ -77,6 +77,9 @@ with import <stockholm/lib>;
         ];
       };
     }
+    {
+      services.redis.enable = true;
+    }
   ];
 
   krebs.build.host = config.krebs.hosts.mors;
-- 
cgit v1.2.3


From 41e6300dbc650814e88de40ad9be292e3cea4de1 Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Thu, 20 Oct 2016 21:10:59 +0200
Subject: l 1 shodan: add sokratess user

---
 lass/1systems/shodan.nix | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

(limited to 'lass/1systems')

diff --git a/lass/1systems/shodan.nix b/lass/1systems/shodan.nix
index 5140591af..7c44807a6 100644
--- a/lass/1systems/shodan.nix
+++ b/lass/1systems/shodan.nix
@@ -22,6 +22,26 @@ with builtins;
     #    };
     #  };
     #}
+    {
+      users.users.sokratess = {
+        uid = genid "sokratess";
+        home = "/home/sokratess";
+        group = "users";
+        createHome = true;
+        extraGroups = [
+         "audio"
+          "networkmanager"
+        ];
+        useDefaultShell = true;
+        password = "aidsballs";
+      };
+      krebs.per-user.sokratess.packages = [
+        pkgs.firefox
+        pkgs.python27Packages.virtualenv
+        pkgs.python27Packages.ipython
+        pkgs.python27Packages.python
+      ];
+    }
   ];
 
   krebs.build.host = config.krebs.hosts.shodan;
-- 
cgit v1.2.3


From 2ecba9acd593d2677903ef5e4d5eecfc38174ed9 Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Thu, 20 Oct 2016 21:40:11 +0200
Subject: l: import <stockholm/lib>

---
 lass/1systems/shodan.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lass/1systems')

diff --git a/lass/1systems/shodan.nix b/lass/1systems/shodan.nix
index 7c44807a6..9d1df1d72 100644
--- a/lass/1systems/shodan.nix
+++ b/lass/1systems/shodan.nix
@@ -1,6 +1,6 @@
 { config, pkgs, ... }:
 
-with builtins;
+with import <stockholm/lib>;
 {
   imports = [
     ../.
-- 
cgit v1.2.3