diff options
author | Ismaël Bouya <ismael.bouya@normalesup.org> | 2020-05-08 00:43:13 +0200 |
---|---|---|
committer | Ismaël Bouya <ismael.bouya@normalesup.org> | 2020-05-08 00:43:13 +0200 |
commit | f5761aac8dbfb4af91c232f2b52d1353c899abda (patch) | |
tree | de7b4dea5c75b5c34943e2b75980c7bf040676df /modules/private/websites/tools/cloud/default.nix | |
parent | dcac3ec730176549cd52a9a42db2001dc652c30d (diff) | |
download | Nix-f5761aac8dbfb4af91c232f2b52d1353c899abda.tar.gz Nix-f5761aac8dbfb4af91c232f2b52d1353c899abda.tar.zst Nix-f5761aac8dbfb4af91c232f2b52d1353c899abda.zip |
Upgrade to latest nixos
Diffstat (limited to 'modules/private/websites/tools/cloud/default.nix')
-rw-r--r-- | modules/private/websites/tools/cloud/default.nix | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/modules/private/websites/tools/cloud/default.nix b/modules/private/websites/tools/cloud/default.nix index 73a837f..0c6bf0d 100644 --- a/modules/private/websites/tools/cloud/default.nix +++ b/modules/private/websites/tools/cloud/default.nix | |||
@@ -10,11 +10,6 @@ let | |||
10 | basedir = builtins.concatStringsSep ":" ( | 10 | basedir = builtins.concatStringsSep ":" ( |
11 | [ nextcloud varDir ] | 11 | [ nextcloud varDir ] |
12 | ++ builtins.attrValues pkgs.webapps.nextcloud-apps); | 12 | ++ builtins.attrValues pkgs.webapps.nextcloud-apps); |
13 | phpConfig = '' | ||
14 | extension=${pkgs.php72Packages.redis}/lib/php/extensions/redis.so | ||
15 | extension=${pkgs.php72Packages.apcu}/lib/php/extensions/apcu.so | ||
16 | zend_extension=${pkgs.php72}/lib/php/extensions/opcache.so | ||
17 | ''; | ||
18 | pool = { | 13 | pool = { |
19 | "listen.owner" = "wwwrun"; | 14 | "listen.owner" = "wwwrun"; |
20 | "listen.group" = "wwwrun"; | 15 | "listen.group" = "wwwrun"; |
@@ -38,7 +33,7 @@ let | |||
38 | "php_admin_value[open_basedir]" = "/run/wrappers/bin/sendmail:${basedir}:/proc/meminfo:/dev/urandom:/proc/self/fd:/tmp"; | 33 | "php_admin_value[open_basedir]" = "/run/wrappers/bin/sendmail:${basedir}:/proc/meminfo:/dev/urandom:/proc/self/fd:/tmp"; |
39 | "php_admin_value[session.save_path]" = "${varDir}/phpSessions"; | 34 | "php_admin_value[session.save_path]" = "${varDir}/phpSessions"; |
40 | }; | 35 | }; |
41 | phpPackage = pkgs.php72; | 36 | phpPackage = pkgs.php72.withExtensions(e: pkgs.php72.enabledExtensions ++ [ e.redis e.apcu e.opcache ]); |
42 | }; | 37 | }; |
43 | in { | 38 | in { |
44 | options.myServices.websites.tools.cloud = { | 39 | options.myServices.websites.tools.cloud = { |
@@ -172,8 +167,7 @@ in { | |||
172 | user = "wwwrun"; | 167 | user = "wwwrun"; |
173 | group = "wwwrun"; | 168 | group = "wwwrun"; |
174 | settings = phpFpm.pool; | 169 | settings = phpFpm.pool; |
175 | phpOptions = config.services.phpfpm.phpOptions + phpFpm.phpConfig; | 170 | phpPackage = pkgs.php72.withExtensions(e: pkgs.php72.enabledExtensions ++ [ e.redis e.apcu e.opcache ]); |
176 | phpPackage = pkgs.php72; | ||
177 | }; | 171 | }; |
178 | 172 | ||
179 | services.cron = { | 173 | services.cron = { |