summaryrefslogtreecommitdiffstats
path: root/makefu/2configs
diff options
context:
space:
mode:
Diffstat (limited to 'makefu/2configs')
-rw-r--r--makefu/2configs/default.nix2
-rw-r--r--makefu/2configs/deployment/owncloud.nix5
2 files changed, 4 insertions, 3 deletions
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 <stockholm/lib>;
};
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";
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