Upgrade nixos

[perso/Immae/Config/Nix.git] / modules / private / websites / teliotortay / production.nix

diff --git a/modules/private/websites/teliotortay/production.nix b/modules/private/websites/teliotortay/production.nix
index 2c62d101f851fab630e91edde72cac3af4945be4..62762ec7606c1002251668064a550a18d4f4e9b5 100644 (file)
--- a/modules/private/websites/teliotortay/production.nix
+++ b/modules/private/websites/teliotortay/production.nix
@@ -1,6 +1,6 @@
 { lib, pkgs, config,  ... }:
 let
-  adminer = pkgs.callPackage ../commons/adminer.nix {};
+  adminer = pkgs.callPackage ../commons/adminer.nix { inherit config; };
   cfg = config.myServices.websites.telioTortay.production;
   varDir = "/var/lib/ftp/telio_tortay";
   env = config.myEnv.websites.telioTortay;
@@ -10,7 +10,7 @@ in {
   config = lib.mkIf cfg.enable {
     services.webstats.sites = [ { name = "telio-tortay.immae.eu"; } ];
 
-    security.acme2.certs."ftp".extraDomains."telio-tortay.immae.eu" = null;
+    security.acme.certs."ftp".extraDomains."telio-tortay.immae.eu" = null;
 
     system.activationScripts.telio-tortay = {
       deps = [ "httpd" ];
@@ -22,20 +22,19 @@ in {
     systemd.services.phpfpm-telio-tortay.after = lib.mkAfter [ "mysql.service" ];
     systemd.services.phpfpm-telio-tortay.wants = [ "mysql.service" ];
     services.phpfpm.pools.telio-tortay = {
-      listen = "/run/phpfpm/telio-tortay.sock";
-      extraConfig = ''
-        user = wwwrun
-        group = wwwrun
-        listen.owner = wwwrun
-        listen.group = wwwrun
+      user = "wwwrun";
+      group = "wwwrun";
+      settings = {
+        "listen.owner" = "wwwrun";
+        "listen.group" = "wwwrun";
 
-        pm = ondemand
-        pm.max_children = 5
-        pm.process_idle_timeout = 60
+        "pm" = "ondemand";
+        "pm.max_children" = "5";
+        "pm.process_idle_timeout" = "60";
 
-        php_admin_value[open_basedir] = "/var/lib/php/sessions/telio-tortay:${varDir}:/tmp"
-        php_admin_value[session.save_path] = "/var/lib/php/sessions/telio-tortay"
-        '';
+        "php_admin_value[open_basedir]" = "/var/lib/php/sessions/telio-tortay:${varDir}:/tmp";
+        "php_admin_value[session.save_path]" = "/var/lib/php/sessions/telio-tortay";
+      };
       phpOptions = config.services.phpfpm.phpOptions + ''
         disable_functions = "mail"
         extension=${pkgs.php}/lib/php/extensions/mysqli.so
@@ -48,7 +47,7 @@ in {
       hosts        = ["telio-tortay.immae.eu" "realistesmedia.fr" "www.realistesmedia.fr" ];
       root         = varDir;
       extraConfig  = [
-        adminer.apache.vhostConf
+        (adminer.apache.vhostConf null)
         ''
         Use Stats telio-tortay.immae.eu
         ServerAdmin ${env.server_admin}
@@ -56,7 +55,7 @@ in {
         CustomLog "${varDir}/logs/access_log" combined
 
         <FilesMatch "\.php$">
-          SetHandler "proxy:unix:/run/phpfpm/telio-tortay.sock|fcgi://localhost"
+          SetHandler "proxy:unix:${config.services.phpfpm.pools.telio-tortay.socket}|fcgi://localhost"
         </FilesMatch>
 
         <Directory ${varDir}/logs>