Add www dir

[perso/Immae/Config/Nix.git] / virtual / eldiron.nix

diff --git a/virtual/eldiron.nix b/virtual/eldiron.nix
index 0c71f87b78c2f1fdd45dd5f8e15e1c7ce89254f7..d90e722d13f3b1ecda60b05154deed18ff576bd8 100644 (file)
--- a/virtual/eldiron.nix
+++ b/virtual/eldiron.nix
@@ -83,18 +83,6 @@
         adminer = mypkgs.adminer.phpFpm.pool;
         connexionswing_dev = mypkgs.connexionswing_dev.phpFpm.pool;
         connexionswing_prod = mypkgs.connexionswing_prod.phpFpm.pool;
-        www = ''
-          listen = /var/run/phpfpm/www.sock
-          user = wwwrun
-          group = wwwrun
-          listen.owner = wwwrun
-          listen.group = wwwrun
-          pm = ondemand
-          pm.max_children = 5
-          pm.process_idle_timeout = 60
-          ;php_admin_flag[log_errors] = on
-          php_admin_value[open_basedir] = "/var/www"
-          '';
       };
     };
 
@@ -103,7 +91,6 @@
       connexionswing_prod = mypkgs.connexionswing_prod.activationScript;
       httpd = ''
         install -d -m 0755 /var/lib/acme/acme-challenge
-        install -d -m 0755 /var/www
         '';
       redis = ''
         mkdir -p /run/redis
@@ -184,8 +171,10 @@
         (withSSL "eldiron" // {
           listen = [ { ip = "*"; port = 443; } ];
           hostName = "eldiron.immae.eu";
-          # FIXME: directory needs to exist
-          documentRoot = "/var/www";
+          documentRoot = ./www;
+          extraConfig = ''
+            DirectoryIndex index.htm
+            '';
         })
         (withSSL "eldiron" // {
           listen = [ { ip = "*"; port = 443; } ];