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/tools | |
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/tools')
-rw-r--r-- | modules/private/websites/tools/tools/default.nix | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/modules/private/websites/tools/tools/default.nix b/modules/private/websites/tools/tools/default.nix index dcda15a..bffcf84 100644 --- a/modules/private/websites/tools/tools/default.nix +++ b/modules/private/websites/tools/tools/default.nix | |||
@@ -317,13 +317,7 @@ in { | |||
317 | 317 | ||
318 | "php_admin_value[open_basedir]" = "/run/wrappers/bin/sendmail:/var/lib/ftp/devtools.immae.eu:/tmp"; | 318 | "php_admin_value[open_basedir]" = "/run/wrappers/bin/sendmail:/var/lib/ftp/devtools.immae.eu:/tmp"; |
319 | }; | 319 | }; |
320 | phpOptions = config.services.phpfpm.phpOptions + '' | 320 | phpPackage = pkgs.php72.withExtensions(e: pkgs.php72.enabledExtensions ++ [e.mysqli e.redis e.apcu e.opcache ]); |
321 | extension=${pkgs.php72}/lib/php/extensions/mysqli.so | ||
322 | extension=${pkgs.php72Packages.redis}/lib/php/extensions/redis.so | ||
323 | extension=${pkgs.php72Packages.apcu}/lib/php/extensions/apcu.so | ||
324 | zend_extension=${pkgs.php72}/lib/php/extensions/opcache.so | ||
325 | ''; | ||
326 | phpPackage = pkgs.php72; | ||
327 | }; | 321 | }; |
328 | adminer = adminer.phpFpm; | 322 | adminer = adminer.phpFpm; |
329 | ttrss = { | 323 | ttrss = { |
@@ -361,9 +355,6 @@ in { | |||
361 | group = "wwwrun"; | 355 | group = "wwwrun"; |
362 | settings = dmarc-reports.phpFpm.pool; | 356 | settings = dmarc-reports.phpFpm.pool; |
363 | phpEnv = dmarc-reports.phpFpm.phpEnv; | 357 | phpEnv = dmarc-reports.phpFpm.phpEnv; |
364 | phpOptions = config.services.phpfpm.phpOptions + '' | ||
365 | extension=${pkgs.php72}/lib/php/extensions/mysqli.so | ||
366 | ''; | ||
367 | phpPackage = pkgs.php72; | 358 | phpPackage = pkgs.php72; |
368 | }; | 359 | }; |
369 | dokuwiki = { | 360 | dokuwiki = { |