From 8becdbf4683ab3cb1d2e006affd09f7f3894addc Mon Sep 17 00:00:00 2001
From: stubbfel <git@stubbe.rocks>
Date: Sun, 27 Oct 2019 19:10:18 +0100
Subject: [PATCH] upgrade to 19.09

---
 services/nextcloud.nix | 26 +++++++++++++-------------
 services/teamspeak.nix |  6 +++---
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/services/nextcloud.nix b/services/nextcloud.nix
index 6a1d86b..0fd1280 100644
--- a/services/nextcloud.nix
+++ b/services/nextcloud.nix
@@ -42,7 +42,7 @@
           # Root
           "/" = {
             extraConfig = ''
-              rewrite ^ /index.php$uri;
+              rewrite ^ /index.php$request_uri;
             '';
           };
           # PHP files
@@ -123,24 +123,24 @@
     ];
 
     # Option I: PHP-FPM pool for Nextcloud
-    services.phpfpm.poolConfigs = let
+    services.phpfpm.pools.nextcloud = let
       phpfpmSocketName = "/run/phpfpm/nextcloud.sock";
       phpfpmUser = "nextcloud";
       phpfpmGroup = "nextcloud";
       server = "nginx";
     in
     {
-      nextcloud = ''
-        listen = ${phpfpmSocketName}
-        listen.owner = ${server}
-        listen.group = ${server}
-        user = ${phpfpmUser}
-        group = ${phpfpmGroup}
-        pm = ondemand
-        pm.max_children = 4
-        pm.process_idle_timeout = 10s
-        pm.max_requests = 200
-      '';
+      settings = {
+        "listen" = "${phpfpmSocketName}";
+        "listen.owner" = "${server}";
+        "listen.group" = "${server}";
+        "user" = "${phpfpmUser}";
+        "group" = "${phpfpmGroup}";
+        "pm" = "ondemand";
+        "pm.max_children" = 4;
+        "pm.process_idle_timeout" = "10s";
+        "pm.max_requests" = 200;
+      };
   };
 
   services.phpfpm.phpOptions = ''
diff --git a/services/teamspeak.nix b/services/teamspeak.nix
index 8fc3db6..0742a89 100644
--- a/services/teamspeak.nix
+++ b/services/teamspeak.nix
@@ -12,9 +12,9 @@ in
 	9987 # ts port
     ];
 
-    nixpkgs.config.packageOverrides = pkgs: {
-	teamspeak_server = unstable.teamspeak_server;
-   };
+#    nixpkgs.config.packageOverrides = pkgs: {
+#	teamspeak_server = unstable.teamspeak_server;
+#   };
 
     services.teamspeak3= {
         enable = true;