Browse Source

updates

pull/1/head
Daniel Poelzleithner 1 year ago
parent
commit
c4d78e168b
5 changed files with 55 additions and 8 deletions
  1. 1
    1
      .gitignore
  2. 5
    1
      ansible/hosts
  3. 8
    0
      ansible/roles/proxmox/tasks/main.yml
  4. 7
    4
      hosts/storage-ng/configuration.nix
  5. 34
    2
      hq.nixops

+ 1
- 1
.gitignore View File

@@ -1 +1 @@
1
-*.retry
1
+.*.swp

+ 5
- 1
ansible/hosts View File

@@ -2,7 +2,11 @@
2 2
 server3.hq.c3d2.de 
3 3
 server4.hq.c3d2.de 
4 4
 server5.hq.c3d2.de
5
-server6.hq.c3d2.de   
5
+server6.hq.c3d2.de
6
+
7
+[hypervisor:vars]
8
+ansible_connection=ssh
9
+ansible_user=root
6 10
 
7 11
 [kubernetes]
8 12
 k8s-1.hq.c3d2.de        

+ 8
- 0
ansible/roles/proxmox/tasks/main.yml View File

@@ -11,6 +11,14 @@
11 11
     - iotop
12 12
     - latencytop
13 13
 
14
+- name: Adjust sysctl values
15
+  copy:
16
+    src: ../files/sysctl/zentralwerk.conf
17
+    dest: /etc/sysctl.d/zentralwerk.conf
18
+
19
+- name: Apply sysctl
20
+  shell: "systemctl restart systemd-sysctl.service"
21
+
14 22
 - name: Cloning  oh-my-zsh
15 23
   git:
16 24
     repo=https://github.com/robbyrussell/oh-my-zsh

+ 7
- 4
hosts/storage-ng/configuration.nix View File

@@ -8,10 +8,10 @@
8 8
   imports =
9 9
     [ # Include the results of the hardware scan.
10 10
       ./hardware-configuration.nix
11
-      ../../common.nix
12
-      ../../users.nix
13
-      #./ncdc.nix
14
-      ../../mpd.nix
11
+      ../../lib/common/c3d2.nix
12
+      ../../lib/users.nix
13
+      ./ncdc.nix
14
+      ../../lib/mpd.nix
15 15
     ];
16 16
 
17 17
   boot.loader.systemd-boot.enable = true;
@@ -69,6 +69,9 @@
69 69
      gitAndTools.git-annex
70 70
      gitAndTools.git
71 71
      tmux
72
+
73
+     mpv
74
+     iotop
72 75
   ];
73 76
 
74 77
   services.ceph = {

+ 34
- 2
hq.nixops View File

@@ -37,7 +37,7 @@
37 37
       };
38 38
     };
39 39
 
40
-	"mpd-index" = 
40
+	"mpd-index" =
41 41
 		{ ... }:
42 42
 		{
43 43
 			imports = [
@@ -60,5 +60,37 @@
60 60
 				storeKeysOnMachine = true;
61 61
 			};
62 62
 		};
63
-
63
+  "elastic1" =
64
+		{ ... }:
65
+		{
66
+			imports = [
67
+				hosts/containers/elastic/configuration.nix
68
+			];
69
+			deployment = {
70
+				targetHost = "2a02:8106:208:5282:e0d5:d8ff:fe54:586c";
71
+				storeKeysOnMachine = true;
72
+			};
73
+	  };
74
+   "logging" =
75
+    { ... }:
76
+		{
77
+			imports = [
78
+				hosts/containers/logging/configuration.nix
79
+			];
80
+			deployment = {
81
+				targetHost = "2a02:8106:208:5282:6811:edff:fe40:89c6";
82
+				storeKeysOnMachine = true;
83
+			};
84
+	  };
85
+    "storage-ng" =
86
+    { ... }:
87
+		{
88
+			imports = [
89
+				hosts/storage-ng/configuration.nix
90
+			];
91
+			deployment = {
92
+				targetHost = "2a02:8106:208:5201::20";
93
+				storeKeysOnMachine = true;
94
+			};
95
+	  };
64 96
 }

Loading…
Cancel
Save