From 89cf2fdfa82b994679a96f420461b593393a84ff Mon Sep 17 00:00:00 2001 From: makefu Date: Wed, 22 Apr 2020 19:14:14 +0200 Subject: ma virtualbox: disable extensionPack --- makefu/2configs/virtualisation/virtualbox.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/makefu/2configs/virtualisation/virtualbox.nix b/makefu/2configs/virtualisation/virtualbox.nix index a8a50939f..dc14b33ae 100644 --- a/makefu/2configs/virtualisation/virtualbox.nix +++ b/makefu/2configs/virtualisation/virtualbox.nix @@ -2,7 +2,7 @@ { virtualisation.virtualbox.host.enable = true; - virtualisation.virtualbox.host.enableExtensionPack = true; + #virtualisation.virtualbox.host.enableExtensionPack = true; # virtualisation.virtualbox.host.enableHardening = false; users.extraGroups.vboxusers.members = [ config.krebs.build.user.name ]; } -- cgit v1.2.3 From 3a378b3f785ea681ec44786313a6e1b1d222ca22 Mon Sep 17 00:00:00 2001 From: makefu Date: Wed, 22 Apr 2020 19:54:44 +0200 Subject: ma owncloud: pkgs.nextcloud -> nextcloud --- makefu/2configs/deployment/owncloud.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/makefu/2configs/deployment/owncloud.nix b/makefu/2configs/deployment/owncloud.nix index ed3155efc..753fc963b 100644 --- a/makefu/2configs/deployment/owncloud.nix +++ b/makefu/2configs/deployment/owncloud.nix @@ -15,6 +15,7 @@ with lib; let # TODO: copy-paste from lass/2/websites/util.nix + nextcloud = nextcloud18; serveCloud = domains: let domain = head domains; @@ -23,9 +24,9 @@ let in { system.activationScripts."prepare-nextcloud-${domain}" = '' if test ! -e ${root} ;then - echo "copying latest ${pkgs.nextcloud.name} release to ${root}" + echo "copying latest ${nextcloud.name} release to ${root}" mkdir -p $(dirname "${root}") - cp -r ${pkgs.nextcloud} "${root}" + cp -r ${nextcloud} "${root}" chown -R nginx:nginx "${root}" chmod 770 "${root}" fi -- cgit v1.2.3 From 4988384a3f4239e89a33fa434a622577fa2731a1 Mon Sep 17 00:00:00 2001 From: makefu Date: Wed, 22 Apr 2020 21:29:56 +0200 Subject: ma x.r: giving up on virtualbox again --- makefu/1systems/x/config.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/makefu/1systems/x/config.nix b/makefu/1systems/x/config.nix index 4c479875e..169f32c16 100644 --- a/makefu/1systems/x/config.nix +++ b/makefu/1systems/x/config.nix @@ -71,7 +71,7 @@ # Virtualization # - + # #{ # networking.firewall.allowedTCPPorts = [ 8080 ]; # networking.nat = { -- cgit v1.2.3 From ccc3126b1071d57e9285ca4fc4013e83e8a4081d Mon Sep 17 00:00:00 2001 From: makefu Date: Wed, 22 Apr 2020 21:50:52 +0200 Subject: nixpkgs: 5272327 -> 1e90c46 --- krebs/nixpkgs.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/krebs/nixpkgs.json b/krebs/nixpkgs.json index 3c4afe8bb..9cef0dd78 100644 --- a/krebs/nixpkgs.json +++ b/krebs/nixpkgs.json @@ -1,7 +1,7 @@ { "url": "https://github.com/NixOS/nixpkgs-channels", - "rev": "5272327b81ed355bbed5659b8d303cf2979b6953", - "date": "2020-04-20T11:58:47-04:00", - "sha256": "0182ys095dfx02vl2a20j1hz92dx3mfgz2a6fhn31bqlp1wa8hlq", + "rev": "1e90c46c2d98f9391df79954a74d14f263cad729", + "date": "2020-04-20T23:47:17-04:00", + "sha256": "1xs0lgh3q1hbrj0lbpy3czw41cv6vxx9kdf2npwc58z8xq3sdqmh", "fetchSubmodules": false } -- cgit v1.2.3 From 3e6850f128edf0c75437c63ae654f1f524061720 Mon Sep 17 00:00:00 2001 From: makefu Date: Wed, 22 Apr 2020 23:40:07 +0200 Subject: ma x.r: re-enable virtualbox, fix warning --- makefu/1systems/x/config.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/makefu/1systems/x/config.nix b/makefu/1systems/x/config.nix index 169f32c16..ea92e3485 100644 --- a/makefu/1systems/x/config.nix +++ b/makefu/1systems/x/config.nix @@ -71,7 +71,7 @@ # Virtualization # - # + #{ # networking.firewall.allowedTCPPorts = [ 8080 ]; # networking.nat = { @@ -162,7 +162,11 @@ krebs.tinc.retiolum.connectTo = [ "omo" "prism" "nextgum" "wbob" ]; # hard dependency because otherwise the device will not be unlocked - boot.initrd.luks.devices = [ { name = "luksroot"; device = "/dev/sda2"; allowDiscards=true; }]; + boot.initrd.luks.devices.luksroot = + { + device = "/dev/sda2"; + allowDiscards = true; + }; # avoid full boot dir boot.loader.grub.configurationLimit = 3; -- cgit v1.2.3 From 575b514c9db74b69f91af19439db3c6b7a93687b Mon Sep 17 00:00:00 2001 From: makefu Date: Wed, 22 Apr 2020 23:40:45 +0200 Subject: ma 2 default: use stable kernel instead of latest better chance for virtualbox to work --- makefu/2configs/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/makefu/2configs/default.nix b/makefu/2configs/default.nix index 6166b87c3..0219e9bb7 100644 --- a/makefu/2configs/default.nix +++ b/makefu/2configs/default.nix @@ -30,7 +30,7 @@ with import ; }; nix.trustedUsers = [ config.krebs.build.user.name ]; - boot.kernelPackages = lib.mkDefault pkgs.linuxPackages_latest; + boot.kernelPackages = lib.mkDefault pkgs.linuxPackages; nixpkgs.config.allowUnfreePredicate = pkg: packageName pkg == "unrar"; -- cgit v1.2.3 From bd7e97477b0529f0f758df197d2f52860564700f Mon Sep 17 00:00:00 2001 From: makefu Date: Wed, 22 Apr 2020 23:41:21 +0200 Subject: ma virtualbox: re-enable extensionpack --- makefu/2configs/virtualisation/virtualbox.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/makefu/2configs/virtualisation/virtualbox.nix b/makefu/2configs/virtualisation/virtualbox.nix index dc14b33ae..a8a50939f 100644 --- a/makefu/2configs/virtualisation/virtualbox.nix +++ b/makefu/2configs/virtualisation/virtualbox.nix @@ -2,7 +2,7 @@ { virtualisation.virtualbox.host.enable = true; - #virtualisation.virtualbox.host.enableExtensionPack = true; + virtualisation.virtualbox.host.enableExtensionPack = true; # virtualisation.virtualbox.host.enableHardening = false; users.extraGroups.vboxusers.members = [ config.krebs.build.user.name ]; } -- cgit v1.2.3