X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=modules%2Fprivate%2Fwebsites%2Fimmae%2Fproduction.nix;h=3b2301a8fd452c93cd89e08d99e84fe1686ab386;hb=0012da0ff3d45df9f68412b90be4f7c24d46a777;hp=f19823a5c0677436253e6859d10c653c49fc77a9;hpb=641efb7d7320412da92a70f7415e8ebdd4e324c8;p=perso%2FImmae%2FConfig%2FNix.git

diff --git a/modules/private/websites/immae/production.nix b/modules/private/websites/immae/production.nix
index f19823a..3b2301a 100644
--- a/modules/private/websites/immae/production.nix
+++ b/modules/private/websites/immae/production.nix
@@ -1,7 +1,9 @@
 { lib, pkgs, config, myconfig,  ... }:
 let
   cfg = config.myServices.websites.immae.production;
-  varDir = "/var/lib/ftp/immae";
+  varDir = "/var/lib/buildbot/outputs/immaeEu";
+  coursDir = "/var/lib/buildbot/outputs/cours";
+  rechercheDir = "/var/lib/buildbot/outputs/recherche";
   env = myconfig.env.websites.immae;
 in {
   options.myServices.websites.immae.production.enable = lib.mkEnableOption "enable Immae's website";
@@ -9,25 +11,6 @@ in {
   config = lib.mkIf cfg.enable {
     services.webstats.sites = [ { name = "www.immae.eu"; } ];
 
-    services.phpfpm.pools.immae = {
-      listen = "/run/phpfpm/immae.sock";
-      extraConfig = ''
-        user = wwwrun
-        group = wwwrun
-        listen.owner = wwwrun
-        listen.group = wwwrun
-
-        pm = ondemand
-        pm.max_children = 5
-        pm.process_idle_timeout = 60
-
-        php_admin_value[open_basedir] = "${varDir}:/tmp"
-        '';
-      phpOptions = config.services.phpfpm.phpOptions + ''
-        extension=${pkgs.php}/lib/php/extensions/mysqli.so
-        '';
-    };
-    services.websites.env.production.modules = [ "proxy_fcgi" ];
     services.websites.env.production.vhostConfs.immae = {
       certName    = "eldiron";
       addToCerts  = true;
@@ -37,21 +20,28 @@ in {
         ''
         Use Stats www.immae.eu
 
-        <FilesMatch "\.php$">
-          SetHandler "proxy:unix:/run/phpfpm/immae.sock|fcgi://localhost"
-        </FilesMatch>
-
         <Directory ${varDir}>
-          DirectoryIndex index.php index.htm index.html
+          DirectoryIndex index.htm index.html
           Options Indexes FollowSymLinks MultiViews Includes
           AllowOverride All
           Require all granted
         </Directory>
 
-        <Location /blog_old/>
-          Use LDAPConnect
-          Require ldap-group cn=blog,cn=immae.eu,ou=services,dc=immae,dc=eu
-        </Location>
+        Alias /cours ${coursDir}
+        <Directory ${coursDir}>
+          DirectoryIndex index.htm index.html
+          Options Indexes FollowSymLinks MultiViews Includes
+          AllowOverride All
+          Require all granted
+        </Directory>
+
+        Alias /recherche ${rechercheDir}
+        <Directory ${rechercheDir}>
+          DirectoryIndex index.htm index.html
+          Options Indexes FollowSymLinks MultiViews Includes
+          AllowOverride All
+          Require all granted
+        </Directory>
         ''
       ];
     };