X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=virtual%2Fmodules%2Fwebsites%2Fchloe%2Fchloe.nix;fp=virtual%2Fpackages%2Fchloe.nix;h=126d8e70579b5b1ae5f9eb053eda5f4b9ad377a9;hb=091ae73429b8853e6ab971bffaccd84bdd59f40d;hp=863331772fc9e8edcbe605826861582d2b4ec5ff;hpb=ad915416a6886010139413f4fbc41ed827336aa2;p=perso%2FImmae%2FConfig%2FNix.git

diff --git a/virtual/packages/chloe.nix b/virtual/modules/websites/chloe/chloe.nix
similarity index 94%
rename from virtual/packages/chloe.nix
rename to virtual/modules/websites/chloe/chloe.nix
index 8633317..126d8e7 100644
--- a/virtual/packages/chloe.nix
+++ b/virtual/modules/websites/chloe/chloe.nix
@@ -21,7 +21,7 @@ let
         php_admin_value[upload_max_filesize] = 20M
         php_admin_value[post_max_size] = 20M
         ;php_admin_flag[log_errors] = on
-        php_admin_value[open_basedir] = "${./spip_mes_options.php}:${configDir}:${webRoot}:${varDir}:/tmp"
+        php_admin_value[open_basedir] = "${../commons/spip/spip_mes_options.php}:${configDir}:${webRoot}:${varDir}:/tmp"
         php_admin_value[session.save_path] = "${varDir}/phpSessions"
         env[SPIP_CONFIG_DIR] = "${configDir}"
         env[SPIP_VAR_DIR] = "${varDir}"
@@ -114,10 +114,10 @@ let
         url = "http://files.spip.org/spip/stable/spip-${version}.zip";
         sha256 = "0cacpxs9nv61i3hzd3nbmplq4mp22s886llhacp3n4923jd6snx5";
       };
-      paches = [ ./spip_ldap_patch.patch ];
+      paches = [ ../commons/spip/spip_ldap_patch.patch ];
       buildPhase = ''
         rm -rf IMG local tmp config/remove.txt
-        ln -sf ${./spip_mes_options.php} config/mes_options.php
+        ln -sf ${../commons/spip/spip_mes_options.php} config/mes_options.php
         echo "Require all denied" > "config/.htaccess"
         ln -sf ../../../../../${varDir}/{IMG,local} .
       '';