summaryrefslogtreecommitdiffstats
path: root/lass
diff options
context:
space:
mode:
authortv <tv@krebsco.de>2021-12-22 23:33:05 +0100
committertv <tv@krebsco.de>2021-12-22 23:33:05 +0100
commit448cd3b9af9e39980676f8ade7e5fb80dbb58b9f (patch)
treead3b7ccfb7107b0053ad2a80cbc2dd97a018e7a6 /lass
parent2656cbf2a91f1f350e29e2ee2faa0bbe90f9b717 (diff)
parent576c05cf3a0ceddefa29c2d0073108177c3cfa52 (diff)
Merge remote-tracking branch 'prism/master'
Diffstat (limited to 'lass')
-rw-r--r--lass/2configs/retiolum.nix1
-rw-r--r--lass/2configs/websites/util.nix1
-rw-r--r--lass/krops.nix4
3 files changed, 4 insertions, 2 deletions
diff --git a/lass/2configs/retiolum.nix b/lass/2configs/retiolum.nix
index 9932f8172..f900bc28e 100644
--- a/lass/2configs/retiolum.nix
+++ b/lass/2configs/retiolum.nix
@@ -14,7 +14,6 @@
};
krebs.tinc.retiolum = {
- enableLegacy = true;
enable = true;
connectTo = [
"prism"
diff --git a/lass/2configs/websites/util.nix b/lass/2configs/websites/util.nix
index bffa1036b..b6765037c 100644
--- a/lass/2configs/websites/util.nix
+++ b/lass/2configs/websites/util.nix
@@ -227,6 +227,7 @@ rec {
services.phpfpm.pools."${domain}" = {
user = "nginx";
group = "nginx";
+ phpPackage = pkgs.php74;
extraConfig = ''
listen = /srv/http/${domain}/phpfpm.pool
pm = dynamic
diff --git a/lass/krops.nix b/lass/krops.nix
index 769112706..4abd010e1 100644
--- a/lass/krops.nix
+++ b/lass/krops.nix
@@ -46,7 +46,9 @@ in {
-f '<nixpkgs/nixos>' config.system.build.toplevel \
-o "$outDir/out"
- $outDir/out/bin/switch-to-configuration switch
+ nix-env -p /nix/var/nix/profiles/system --set "$outDir/out"
+
+ "$outDir/out/bin/switch-to-configuration" switch
'';
source = source { test = false; };
allocateTTY = true;