WIP upgrade

[perso/Immae/Config/Nix.git] / modules / private / websites / jerome / naturaloutil.nix

diff --git a/modules/private/websites/jerome/naturaloutil.nix b/modules/private/websites/jerome/naturaloutil.nix
index 8bbb49e64cc57700cefefc5a246cd8f9c10fcbf8..762fce40cb67401fa4502e2f28cf0e05adbc5904 100644 (file)
--- a/modules/private/websites/jerome/naturaloutil.nix
+++ b/modules/private/websites/jerome/naturaloutil.nix
@@ -13,10 +13,9 @@ in {
   config = lib.mkIf cfg.enable {
     services.webstats.sites = [ { name = "naturaloutil.immae.eu"; } ];
 
-    security.acme.certs."ftp".extraDomains."naturaloutil.immae.eu" = null;
+    security.acme.certs."ftp".extraDomainNames = [ "naturaloutil.immae.eu" ];
 
-    secrets.keys = [{
-      dest = "websites/jerome/naturaloutil";
+    secrets.keys."websites/jerome/naturaloutil" = {
       user = apacheUser;
       group = apacheGroup;
       permissions = "0400";
@@ -35,7 +34,7 @@ in {
         $database = connect_db($db, $mysql_server, $mysql_base, $mysql_user, $mysql_password);
         ?>
       '';
-    }];
+    };
     system.activationScripts.jerome_naturaloutil = {
       deps = [ "httpd" ];
       text = ''
@@ -61,9 +60,7 @@ in {
       phpEnv = {
         BDD_CONNECT = secretsPath;
       };
-      phpOptions = config.services.phpfpm.phpOptions + ''
-        extension=${pkgs.php}/lib/php/extensions/mysqli.so
-        '';
+      phpPackage = pkgs.php72;
     };
     services.websites.env.production.modules = adminer.apache.modules ++ [ "proxy_fcgi" ];
     services.websites.env.production.vhostConfs.jerome_naturaloutil = {