1 files changed, 7 insertions, 54 deletions

diff --git a/modules/private/websites/papa/maison_bbc.nix b/modules/private/websites/papa/maison_bbc.nix
index aa6d866..528c832 100644
--- a/modules/private/websites/papa/maison_bbc.nix
+++ b/modules/private/websites/papa/maison_bbc.nix
@@ -1,73 +1,26 @@
-{ lib, pkgs, config, ... }:
+{ lib, config, ... }:
 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;
+  webappdirs = config.services.websites.webappDirsPaths;
 in {
   options.myServices.websites.papa.maison_bbc.enable = lib.mkEnableOption "enable Papa Maison bbc website";
 
   config = lib.mkIf cfg.enable {
-    services.duplyBackup.profiles.papa_maison_bbc.rootDir = varDir;
     services.webstats.sites = [ { name = "maison.bbc.bouya.org"; } ];
-    services.phpfpm.pools.papa_maison_bbc = {
-      user = apacheUser;
-      group = apacheGroup;
-      settings = {
-        "listen.owner" = apacheUser;
-        "listen.group" = apacheGroup;
 
-        "pm" = "ondemand";
-        "pm.max_children" = "5";
-        "pm.process_idle_timeout" = "60";
-
-        "php_admin_value[open_basedir]" = varDir;
-      };
-      phpOptions = config.services.phpfpm.phpOptions + ''
-        date.timezone = 'Europe/Paris'
-      '';
-      phpPackage = pkgs.php72;
-    };
-
-    services.websites.env.production.modules = [ "proxy_fcgi" ];
-    services.websites.env.production.vhostNoSSLConfs.papa_maison_bbc = {
-      hosts        = [ "maison.bbc.bouya.org" ];
-      root         = varDir;
-      extraConfig  = [
-        ''
-        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
-          AllowOverride None
-          Require all granted
-          <FilesMatch "\.php$">
-            SetHandler "proxy:unix:${config.services.phpfpm.pools.papa_maison_bbc.socket}|fcgi://localhost"
-          </FilesMatch>
-        </Directory>
-        <Directory "${config.myServices.certificates.webroot}">
-          Options Indexes FollowSymLinks
-          AllowOverride None
-          Require all granted
-        </Directory>
-          ''
-      ];
-    };
+    services.websites.webappDirs.papa_maison_bbc = ./maison_bbc_static;
     services.websites.env.production.vhostConfs.papa_maison_bbc = {
       certName     = "papa";
       addToCerts   = true;
       hosts        = [ "maison.bbc.bouya.org" ];
-      root         = varDir;
-      forceSSL     = false;
+      root         = webappdirs.papa_maison_bbc;
       extraConfig  = [
         ''
-        <Directory ${varDir}>
-          DirectoryIndex index.php index.htm index.html
+        ErrorDocument 404 /index.html
+        <Directory ${webappdirs.papa_maison_bbc}>
+          DirectoryIndex index.htm index.html
           AllowOverride None
           Require all granted
-          <FilesMatch "\.php$">
-            SetHandler "proxy:unix:${config.services.phpfpm.pools.papa_maison_bbc.socket}|fcgi://localhost"
-          </FilesMatch>
         </Directory>
           ''
       ];