From 31ff7157ef033d4fee253b848c434a0bd0c8c457 Mon Sep 17 00:00:00 2001 From: makefu Date: Fri, 28 Jul 2017 15:44:43 +0200 Subject: ma darth: fix path to samba share config --- makefu/1systems/darth/config.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'makefu') diff --git a/makefu/1systems/darth/config.nix b/makefu/1systems/darth/config.nix index c8d17ca70..e0f90b8dd 100644 --- a/makefu/1systems/darth/config.nix +++ b/makefu/1systems/darth/config.nix @@ -18,7 +18,7 @@ in { - + ]; services.samba.shares = { isos = { -- cgit v1.2.3 From 059b2e3477c9de2a6e69573c16bcf8b2826e0ae9 Mon Sep 17 00:00:00 2001 From: makefu Date: Fri, 28 Jul 2017 21:57:25 +0200 Subject: ma dummy-secrets: add kibana-auth --- makefu/6tests/data/secrets/kibana-auth.nix | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 makefu/6tests/data/secrets/kibana-auth.nix (limited to 'makefu') diff --git a/makefu/6tests/data/secrets/kibana-auth.nix b/makefu/6tests/data/secrets/kibana-auth.nix new file mode 100644 index 000000000..80e8f44c1 --- /dev/null +++ b/makefu/6tests/data/secrets/kibana-auth.nix @@ -0,0 +1,4 @@ +{ + "dick" = "butt"; +} + -- cgit v1.2.3 From 6919ec53cc640e0b813989012eecc58665887e19 Mon Sep 17 00:00:00 2001 From: makefu Date: Fri, 28 Jul 2017 21:59:28 +0200 Subject: ma tsp: fix rewrite to stockholm --- makefu/1systems/tsp/config.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'makefu') diff --git a/makefu/1systems/tsp/config.nix b/makefu/1systems/tsp/config.nix index 7169638d4..75a11d3a7 100644 --- a/makefu/1systems/tsp/config.nix +++ b/makefu/1systems/tsp/config.nix @@ -10,7 +10,8 @@ # hardware specifics are in here - + # imports tp-x2x0.nix + -- cgit v1.2.3 From 7c34ba4bbf3446a8ead66bed7a42bed6a12d72a6 Mon Sep 17 00:00:00 2001 From: makefu Date: Fri, 28 Jul 2017 22:05:09 +0200 Subject: ma dummy-secrets: add ssh.id_ed25519 --- makefu/6tests/data/secrets/ssh.id_ed25519 | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 makefu/6tests/data/secrets/ssh.id_ed25519 (limited to 'makefu') diff --git a/makefu/6tests/data/secrets/ssh.id_ed25519 b/makefu/6tests/data/secrets/ssh.id_ed25519 new file mode 100644 index 000000000..e69de29bb -- cgit v1.2.3 From 97783ee360f3e9e59fbfaaea4a03ae96f187eb64 Mon Sep 17 00:00:00 2001 From: makefu Date: Fri, 28 Jul 2017 22:06:19 +0200 Subject: ma pnp: remove Reaktor path --- makefu/1systems/pnp/config.nix | 1 - 1 file changed, 1 deletion(-) (limited to 'makefu') diff --git a/makefu/1systems/pnp/config.nix b/makefu/1systems/pnp/config.nix index cc6326f19..de920cc3f 100644 --- a/makefu/1systems/pnp/config.nix +++ b/makefu/1systems/pnp/config.nix @@ -8,7 +8,6 @@ [ - ../../krebs/3modules/Reaktor.nix # these will be overwritten by qemu-vm.nix but will be used if the system # is directly deployed -- cgit v1.2.3 From 88fb3eedd6791e05a0df6cae46d53f838e3d2918 Mon Sep 17 00:00:00 2001 From: makefu Date: Fri, 28 Jul 2017 22:43:30 +0200 Subject: ma dummy-secrets: add grafana_security --- makefu/6tests/data/secrets/grafana_security.nix | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 makefu/6tests/data/secrets/grafana_security.nix (limited to 'makefu') diff --git a/makefu/6tests/data/secrets/grafana_security.nix b/makefu/6tests/data/secrets/grafana_security.nix new file mode 100644 index 000000000..f9096b7cf --- /dev/null +++ b/makefu/6tests/data/secrets/grafana_security.nix @@ -0,0 +1,5 @@ +{ + adminUser = "dick"; + adminPassword = "butt"; +} + -- cgit v1.2.3 From 0367927ec8f8279b984194b5a170d0e04f0f55b0 Mon Sep 17 00:00:00 2001 From: makefu Date: Fri, 28 Jul 2017 23:00:57 +0200 Subject: ma dummy-secrets: add nsupdate-search.nix --- makefu/6tests/data/secrets/nsupdate-search.nix | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 makefu/6tests/data/secrets/nsupdate-search.nix (limited to 'makefu') diff --git a/makefu/6tests/data/secrets/nsupdate-search.nix b/makefu/6tests/data/secrets/nsupdate-search.nix new file mode 100644 index 000000000..a9646aeb7 --- /dev/null +++ b/makefu/6tests/data/secrets/nsupdate-search.nix @@ -0,0 +1,3 @@ +{ + "dick.nsupdate.info" = "butt"; +} -- cgit v1.2.3 From 8e3b4fec4485003898eec51f431a7cca6a2d907e Mon Sep 17 00:00:00 2001 From: makefu Date: Fri, 28 Jul 2017 23:03:19 +0200 Subject: ma filepimp: fix disk builder (again) --- makefu/1systems/filepimp/config.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'makefu') diff --git a/makefu/1systems/filepimp/config.nix b/makefu/1systems/filepimp/config.nix index 65e81af66..7e5d7d0eb 100644 --- a/makefu/1systems/filepimp/config.nix +++ b/makefu/1systems/filepimp/config.nix @@ -73,9 +73,9 @@ in { xfsmount = name: dev: { "/media/${name}" = { device = dev; fsType = "xfs"; }; }; in - # (xfsmount "j0" (part1 jDisk0)) - (xfsmount "j1" (part1 jDisk1)) - (xfsmount "j2" (part1 jDisk2)) + # (xfsmount "j0" (part1 jDisk0)) // + (xfsmount "j1" (part1 jDisk1)) // + (xfsmount "j2" (part1 jDisk2)) // (xfsmount "par0" (part1 jDisk3)) ; -- cgit v1.2.3 From b28d64255a9d61f89e375dc8f6d39e1c34aa6900 Mon Sep 17 00:00:00 2001 From: makefu Date: Fri, 28 Jul 2017 23:05:16 +0200 Subject: ma owncloud: disable mysql.dataDir rootPassword deployment for now --- makefu/2configs/deployment/owncloud.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'makefu') diff --git a/makefu/2configs/deployment/owncloud.nix b/makefu/2configs/deployment/owncloud.nix index c6fb9c8e5..65ac5c184 100644 --- a/makefu/2configs/deployment/owncloud.nix +++ b/makefu/2configs/deployment/owncloud.nix @@ -140,10 +140,10 @@ in { enable = false; databases = [ "nextcloud" ]; }; - - krebs.secret.files.mysql_rootPassword = { - path = "${config.services.mysql.dataDir}/mysql_rootPassword"; - owner.name = "root"; - source-path = toString + "/mysql_rootPassword"; - }; + # dataDir is only defined after mysql is enabled + # krebs.secret.files.mysql_rootPassword = { + # path = "${config.services.mysql.dataDir}/mysql_rootPassword"; + # owner.name = "root"; + # source-path = toString + "/mysql_rootPassword"; + # }; } -- cgit v1.2.3 From d761743c4bb8149c8c962967108a0ff955b86c5f Mon Sep 17 00:00:00 2001 From: makefu Date: Fri, 28 Jul 2017 23:50:36 +0200 Subject: ma filepimp: use nondistributableFirmware --- makefu/1systems/filepimp/config.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'makefu') diff --git a/makefu/1systems/filepimp/config.nix b/makefu/1systems/filepimp/config.nix index 7e5d7d0eb..e9058ec85 100644 --- a/makefu/1systems/filepimp/config.nix +++ b/makefu/1systems/filepimp/config.nix @@ -44,7 +44,7 @@ in { kernelModules = [ "kvm-amd" ]; extraModulePackages = [ ]; }; - hardware.enableAllFirmware = true; + hardware.enableRedistributableFirmware = true; hardware.cpu.amd.updateMicrocode = true; zramSwap.enable = true; -- cgit v1.2.3