From c75b75a2e15cc6ea665e5e51629c528ebc31fcd3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Isma=C3=ABl=20Bouya?= Date: Sat, 7 Sep 2019 11:02:12 +0200 Subject: Remove php from immae.eu --- modules/private/websites/immae/production.nix | 23 ----------------------- modules/private/websites/tools/tools/default.nix | 1 + 2 files changed, 1 insertion(+), 23 deletions(-) (limited to 'modules') diff --git a/modules/private/websites/immae/production.nix b/modules/private/websites/immae/production.nix index f19823a..6b88ff2 100644 --- a/modules/private/websites/immae/production.nix +++ b/modules/private/websites/immae/production.nix @@ -9,25 +9,6 @@ in { config = lib.mkIf cfg.enable { services.webstats.sites = [ { name = "www.immae.eu"; } ]; - services.phpfpm.pools.immae = { - listen = "/run/phpfpm/immae.sock"; - extraConfig = '' - user = wwwrun - group = wwwrun - listen.owner = wwwrun - listen.group = wwwrun - - pm = ondemand - pm.max_children = 5 - pm.process_idle_timeout = 60 - - php_admin_value[open_basedir] = "${varDir}:/tmp" - ''; - phpOptions = config.services.phpfpm.phpOptions + '' - extension=${pkgs.php}/lib/php/extensions/mysqli.so - ''; - }; - services.websites.env.production.modules = [ "proxy_fcgi" ]; services.websites.env.production.vhostConfs.immae = { certName = "eldiron"; addToCerts = true; @@ -37,10 +18,6 @@ in { '' Use Stats www.immae.eu - - SetHandler "proxy:unix:/run/phpfpm/immae.sock|fcgi://localhost" - - DirectoryIndex index.php index.htm index.html Options Indexes FollowSymLinks MultiViews Includes diff --git a/modules/private/websites/tools/tools/default.nix b/modules/private/websites/tools/tools/default.nix index 5b368e0..e17c708 100644 --- a/modules/private/websites/tools/tools/default.nix +++ b/modules/private/websites/tools/tools/default.nix @@ -217,6 +217,7 @@ in { php_admin_value[open_basedir] = "/run/wrappers/bin/sendmail:/var/lib/ftp/devtools.immae.eu:/tmp" ''; phpOptions = config.services.phpfpm.phpOptions + '' + extension=${pkgs.php}/lib/php/extensions/mysqli.so extension=${pkgs.phpPackages.redis}/lib/php/extensions/redis.so extension=${pkgs.phpPackages.apcu}/lib/php/extensions/apcu.so zend_extension=${pkgs.php}/lib/php/extensions/opcache.so -- cgit v1.2.3