Fix acme certificate generation

[perso/Immae/Config/Nix.git] / modules / private / websites / papa / maison_bbc.nix

diff --git a/modules/private/websites/papa/maison_bbc.nix b/modules/private/websites/papa/maison_bbc.nix
index d94a0271e514bdfd295c61dc26bfeeaba5436f97..aa6d86669578208dafa55e859fe053381dd3cd53 100644 (file)
--- a/modules/private/websites/papa/maison_bbc.nix
+++ b/modules/private/websites/papa/maison_bbc.nix
@@ -25,8 +25,8 @@ in {
       };
       phpOptions = config.services.phpfpm.phpOptions + ''
         date.timezone = 'Europe/Paris'
-        extension=${pkgs.php}/lib/php/extensions/mysqli.so
-        '';
+      '';
+      phpPackage = pkgs.php72;
     };
 
     services.websites.env.production.modules = [ "proxy_fcgi" ];
@@ -35,7 +35,7 @@ in {
       root         = varDir;
       extraConfig  = [
         ''
-        Alias /.well-known/acme-challenge ${config.security.acme.certs.papa.webroot}/.well-known/acme-challenge
+        Alias /.well-known/acme-challenge ${config.myServices.certificates.webroot}/.well-known/acme-challenge
         RedirectMatch 301 ^/((?!(\.well-known|add.php).*$).*)$ https://maison.bbc.bouya.org/$1
         <Directory ${varDir}>
           DirectoryIndex index.php index.htm index.html
@@ -45,7 +45,7 @@ in {
             SetHandler "proxy:unix:${config.services.phpfpm.pools.papa_maison_bbc.socket}|fcgi://localhost"
           </FilesMatch>
         </Directory>
-        <Directory "${config.security.acme.certs.papa.webroot}">
+        <Directory "${config.myServices.certificates.webroot}">
           Options Indexes FollowSymLinks
           AllowOverride None
           Require all granted