Merge remote-tracking branch 'gum/20.09' into 20.09

3 files changed, 29 insertions, 12 deletions

diff --git a/krebs/1systems/puyak/config.nix b/krebs/1systems/puyak/config.nix
index 0cadc3a10..9ee61c6f8 100644
--- a/krebs/1systems/puyak/config.nix
+++ b/krebs/1systems/puyak/config.nix
@@ -14,12 +14,17 @@
 
     <stockholm/krebs/2configs/binary-cache/nixos.nix>
     <stockholm/krebs/2configs/binary-cache/prism.nix>
+
+    ### Krebs ###
     <stockholm/krebs/2configs/go.nix>
+
+    #### NEWS ####
     <stockholm/krebs/2configs/ircd.nix>
-    <stockholm/krebs/2configs/news.nix>
-    <stockholm/krebs/2configs/news-spam.nix>
+    #<stockholm/krebs/2configs/news.nix>
+    #<stockholm/krebs/2configs/news-spam.nix>
+
 
-    ###   shackspace
+    ### shackspace ###
     # handle the worlddomination map via coap
     <stockholm/krebs/2configs/shack/worlddomination.nix>
     <stockholm/krebs/2configs/shack/ssh-keys.nix>
diff --git a/krebs/5pkgs/simple/alertmanager-bot-telegram/default.nix b/krebs/5pkgs/simple/alertmanager-bot-telegram/default.nix
index a84407457..79a1740fd 100644
--- a/krebs/5pkgs/simple/alertmanager-bot-telegram/default.nix
+++ b/krebs/5pkgs/simple/alertmanager-bot-telegram/default.nix
@@ -11,7 +11,7 @@ buildGoModule rec {
     sha256 = "09cciml1j8x76jpm2v5v6h2q6j1fkhsz1kswslmx8wl4wk40xgp4";
   };
 
-  vendorSha256 = "0nlnxkpcna7g7qslyz5i1619paw4jkb1ma4fgpsgvgx1spwrjm8h";
+  vendorSha256 = "1v0fgin8dn81b559zz4lqmrl7hikr46g4gb18sci4riql5qs1isj";
   postInstall = ''
     install -D ./default.tmpl $out/templates/default.tmpl
   '';
diff --git a/makefu/2configs/deployment/owncloud.nix b/makefu/2configs/deployment/owncloud.nix
index 317e0a29f..af6592b2b 100644
--- a/makefu/2configs/deployment/owncloud.nix
+++ b/makefu/2configs/deployment/owncloud.nix
@@ -14,8 +14,18 @@ with lib;
 
 
 let
+  phpPackage = let
+      base = pkgs.php74;
+    in
+      base.buildEnv {
+        extensions = { enabled, all }: with all;
+          enabled ++ [
+            apcu redis memcached imagick
+          ];
+      };
+
   # TODO: copy-paste from lass/2/websites/util.nix
-  nextcloud = pkgs.nextcloud18;
+  nextcloud = pkgs.nextcloud20;
   serveCloud = domains:
     let
       domain = head domains;
@@ -126,6 +136,7 @@ let
       services.phpfpm.pools."${domain}" = {
           user = "nginx";
           group = "nginx";
+          phpPackage = phpPackage;
           settings = {
             "listen.owner" = "nginx";
             "pm" = "dynamic";
@@ -138,7 +149,7 @@ let
             "php_admin_flag[log_errors]" = "on";
             "catch_workers_output" = true;
           };
-          phpEnv."PATH" = lib.makeBinPath [ pkgs.php ];
+          phpEnv."PATH" = lib.makeBinPath [ phpPackage ];
       };
       services.phpfpm.phpOptions = ''
         opcache.enable=1
@@ -149,7 +160,7 @@ let
         opcache.save_comments=1
         opcache.revalidate_freq=1
         opcache.file_cache = .opcache
-        zend_extension=${pkgs.php}/lib/php/extensions/opcache.so
+        zend_extension=${phpPackage}/lib/php/extensions/opcache.so
 
         display_errors = on
         display_startup_errors = on
@@ -157,14 +168,15 @@ let
         error_reporting = E_ALL | E_STRICT
         html_errors = On
         date.timezone = "Europe/Berlin"
-        # extension=${pkgs.phpPackages.memcached}/lib/php/extensions/memcached.so
-        extension=${pkgs.phpPackages.redis}/lib/php/extensions/redis.so
-        extension=${pkgs.phpPackages.apcu}/lib/php/extensions/apcu.so
-      '';
+        extension=${phpPackage}/lib/php/extensions/memcached.so
+        extension=${phpPackage}/lib/php/extensions/redis.so
+        extension=${phpPackage}/lib/php/extensions/apcu.so
+        '';
+
       systemd.services."nextcloud-cron-${domain}" = {
         serviceConfig = {
           User = "nginx";
-          ExecStart = "${pkgs.php}/bin/php -f ${root}/cron.php";
+          ExecStart = "${phpPackage}/bin/php -f ${root}/cron.php";
         };
         startAt = "*:0/15";
       };