From c4d78e168b27cb2f3f738c9351a8f3e193f71588 Mon Sep 17 00:00:00 2001
From: Daniel Poelzleithner <git@poelzi.org>
Date: Wed, 3 Jul 2019 20:17:45 +0200
Subject: [PATCH] updates

---
 .gitignore                           |  2 +-
 ansible/hosts                        |  6 ++++-
 ansible/roles/proxmox/tasks/main.yml |  8 +++++++
 hosts/storage-ng/configuration.nix   | 11 +++++----
 hq.nixops                            | 36 ++++++++++++++++++++++++++--
 5 files changed, 55 insertions(+), 8 deletions(-)

diff --git a/.gitignore b/.gitignore
index a8b42eb6..a01ee289 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-*.retry
+.*.swp
diff --git a/ansible/hosts b/ansible/hosts
index 487d3807..15efe640 100644
--- a/ansible/hosts
+++ b/ansible/hosts
@@ -2,7 +2,11 @@
 server3.hq.c3d2.de 
 server4.hq.c3d2.de 
 server5.hq.c3d2.de
-server6.hq.c3d2.de   
+server6.hq.c3d2.de
+
+[hypervisor:vars]
+ansible_connection=ssh
+ansible_user=root
 
 [kubernetes]
 k8s-1.hq.c3d2.de        
diff --git a/ansible/roles/proxmox/tasks/main.yml b/ansible/roles/proxmox/tasks/main.yml
index 59f0789d..7e5878c0 100644
--- a/ansible/roles/proxmox/tasks/main.yml
+++ b/ansible/roles/proxmox/tasks/main.yml
@@ -11,6 +11,14 @@
     - iotop
     - latencytop
 
+- name: Adjust sysctl values
+  copy:
+    src: ../files/sysctl/zentralwerk.conf
+    dest: /etc/sysctl.d/zentralwerk.conf
+
+- name: Apply sysctl
+  shell: "systemctl restart systemd-sysctl.service"
+
 - name: Cloning  oh-my-zsh
   git:
     repo=https://github.com/robbyrussell/oh-my-zsh
diff --git a/hosts/storage-ng/configuration.nix b/hosts/storage-ng/configuration.nix
index 96cb9ac7..edffe50d 100644
--- a/hosts/storage-ng/configuration.nix
+++ b/hosts/storage-ng/configuration.nix
@@ -8,10 +8,10 @@
   imports =
     [ # Include the results of the hardware scan.
       ./hardware-configuration.nix
-      ../../common.nix
-      ../../users.nix
-      #./ncdc.nix
-      ../../mpd.nix
+      ../../lib/common/c3d2.nix
+      ../../lib/users.nix
+      ./ncdc.nix
+      ../../lib/mpd.nix
     ];
 
   boot.loader.systemd-boot.enable = true;
@@ -69,6 +69,9 @@
      gitAndTools.git-annex
      gitAndTools.git
      tmux
+
+     mpv
+     iotop
   ];
 
   services.ceph = {
diff --git a/hq.nixops b/hq.nixops
index 549006b6..2ec7022b 100644
--- a/hq.nixops
+++ b/hq.nixops
@@ -37,7 +37,7 @@
       };
     };
 
-	"mpd-index" = 
+	"mpd-index" =
 		{ ... }:
 		{
 			imports = [
@@ -60,5 +60,37 @@
 				storeKeysOnMachine = true;
 			};
 		};
-
+  "elastic1" =
+		{ ... }:
+		{
+			imports = [
+				hosts/containers/elastic/configuration.nix
+			];
+			deployment = {
+				targetHost = "2a02:8106:208:5282:e0d5:d8ff:fe54:586c";
+				storeKeysOnMachine = true;
+			};
+	  };
+   "logging" =
+    { ... }:
+		{
+			imports = [
+				hosts/containers/logging/configuration.nix
+			];
+			deployment = {
+				targetHost = "2a02:8106:208:5282:6811:edff:fe40:89c6";
+				storeKeysOnMachine = true;
+			};
+	  };
+    "storage-ng" =
+    { ... }:
+		{
+			imports = [
+				hosts/storage-ng/configuration.nix
+			];
+			deployment = {
+				targetHost = "2a02:8106:208:5201::20";
+				storeKeysOnMachine = true;
+			};
+	  };
 }