Upgrade to latest nixos

[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 11e7937a4db7856c9f6cfd72ab5204b1cfc9bf9d..5fbc62f6abc85407652db54ed709f749081032c7 100644 (file)
--- a/modules/private/websites/papa/maison_bbc.nix
+++ b/modules/private/websites/papa/maison_bbc.nix
@@ -2,6 +2,8 @@
 let
   cfg = config.myServices.websites.papa.maison_bbc;
   varDir = "/var/lib/ftp/papa/site";
+  apacheUser = config.services.httpd.Prod.user;
+  apacheGroup = config.services.httpd.Prod.group;
 in {
   options.myServices.websites.papa.maison_bbc.enable = lib.mkEnableOption "enable Papa Maison bbc website";
 
@@ -9,11 +11,11 @@ in {
     services.duplyBackup.profiles.papa_maison_bbc.rootDir = varDir;
     services.webstats.sites = [ { name = "maison.bbc.bouya.org"; } ];
     services.phpfpm.pools.papa_maison_bbc = {
-      user = "wwwrun";
-      group = "wwwrun";
+      user = apacheUser;
+      group = apacheGroup;
       settings = {
-        "listen.owner" = "wwwrun";
-        "listen.group" = "wwwrun";
+        "listen.owner" = apacheUser;
+        "listen.group" = apacheGroup;
 
         "pm" = "ondemand";
         "pm.max_children" = "5";
@@ -23,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" ];
@@ -56,6 +58,7 @@ in {
       addToCerts   = true;
       hosts        = [ "maison.bbc.bouya.org" ];
       root         = varDir;
+      forceSSL     = false;
       extraConfig  = [
         ''
         <Directory ${varDir}>