summaryrefslogtreecommitdiffstats
path: root/makefu
diff options
context:
space:
mode:
Diffstat (limited to 'makefu')
-rw-r--r--makefu/1systems/darth/config.nix2
-rw-r--r--makefu/1systems/filepimp/config.nix8
-rw-r--r--makefu/1systems/pnp/config.nix1
-rw-r--r--makefu/1systems/tsp/config.nix3
-rw-r--r--makefu/2configs/deployment/owncloud.nix12
-rw-r--r--makefu/6tests/data/secrets/grafana_security.nix5
-rw-r--r--makefu/6tests/data/secrets/kibana-auth.nix4
-rw-r--r--makefu/6tests/data/secrets/nsupdate-search.nix3
-rw-r--r--makefu/6tests/data/secrets/ssh.id_ed255190
9 files changed, 25 insertions, 13 deletions
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 {
<stockholm/makefu/2configs/virtualization.nix>
<stockholm/makefu/2configs/tinc/retiolum.nix>
- <stockholm/makefu/2configs/temp-share-samba.nix>
+ <stockholm/makefu/2configs/share/temp-share-samba.nix>
];
services.samba.shares = {
isos = {
diff --git a/makefu/1systems/filepimp/config.nix b/makefu/1systems/filepimp/config.nix
index 65e81af66..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;
@@ -73,9 +73,9 @@ in {
xfsmount = name: dev:
{ "/media/${name}" = { device = dev; fsType = "xfs"; }; };
in
- # (xfsmount "j0" (part1 jDisk0)) <stockholm/makefu>
- (xfsmount "j1" (part1 jDisk1)) <stockholm/makefu>
- (xfsmount "j2" (part1 jDisk2)) <stockholm/makefu>
+ # (xfsmount "j0" (part1 jDisk0)) //
+ (xfsmount "j1" (part1 jDisk1)) //
+ (xfsmount "j2" (part1 jDisk2)) //
(xfsmount "par0" (part1 jDisk3))
;
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 @@
[
<stockholm/makefu>
<stockholm/makefu/2configs/headless.nix>
- ../../krebs/3modules/Reaktor.nix
# these will be overwritten by qemu-vm.nix but will be used if the system
# is directly deployed
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 @@
<stockholm/makefu/2configs/gui/base.nix>
<stockholm/makefu/2configs/fs/sda-crypto-root.nix>
# hardware specifics are in here
- <stockholm/makefu/2configs/hw/tp-x200.nix #< imports tp-x2x0.nix>
+ # imports tp-x2x0.nix
+ <stockholm/makefu/2configs/hw/tp-x200.nix>
<stockholm/makefu/2configs/disable_v6.nix>
<stockholm/makefu/2configs/rad1o.nix>
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 <secrets> + "/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 <secrets> + "/mysql_rootPassword";
+ # };
}
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";
+}
+
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";
+}
+
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";
+}
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
--- /dev/null
+++ b/makefu/6tests/data/secrets/ssh.id_ed25519