From 07f2f340ec1356562855342440297b50f8ac6856 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Isma=C3=ABl=20Bouya?= <ismael.bouya@normalesup.org>
Date: Tue, 8 Jan 2019 00:02:52 +0100
Subject: [PATCH] Remove tmp from spip links

---
 virtual/packages/chloe.nix            | 14 ++++++--------
 virtual/packages/spip_mes_options.php |  5 +++--
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/virtual/packages/chloe.nix b/virtual/packages/chloe.nix
index 7288558..a867bf2 100644
--- a/virtual/packages/chloe.nix
+++ b/virtual/packages/chloe.nix
@@ -23,6 +23,8 @@ let
         ;php_admin_flag[log_errors] = on
         php_admin_value[open_basedir] = "${./spip_mes_options.php}:${configDir}:${webRoot}:${varDir}:/tmp"
         env[SPIP_CONFIG_DIR] = "${configDir}"
+        env[SPIP_VAR_DIR] = "${varDir}"
+        env[SPIP_SITE] = "chloe-${environment}"
         env[SPIP_LDAP_BASE] = "dc=immae,dc=eu"
         env[SPIP_LDAP_HOST] = "ldaps://ldap.immae.eu"
         env[SPIP_LDAP_SEARCH_DN] = "${builtins.getEnv "NIXOPS_${varPrefix}_${envName}_LDAP_DN"}"
@@ -67,10 +69,6 @@ let
           Require all granted
         </Directory>
 
-        <DirectoryMatch "${varDir}/tmp">
-          Require all denied
-        </DirectoryMatch>
-
         <DirectoryMatch "${webRoot}/squelettes">
           Require all denied
         </DirectoryMatch>
@@ -93,7 +91,7 @@ let
     activationScript = {
       deps = [ "wrappers" ];
       text = ''
-        install -m 0755 -o ${apache.user} -g ${apache.group} -d ${varDir} ${varDir}/tmp ${varDir}/local
+        install -m 0755 -o ${apache.user} -g ${apache.group} -d ${varDir} ${varDir}/IMG ${varDir}/tmp ${varDir}/local
       '';
     };
     configDir = ./chloe_config;
@@ -108,10 +106,10 @@ let
       buildInputs = [ sassc ];
     });
     webRoot = stdenv.mkDerivation rec {
-      name = "spip-${version}";
+      name = "chloe-${environment}-spip-${version}";
       version = "3.2";
       src = fetchzip {
-        url = "http://files.spip.org/spip/stable/${name}.zip";
+        url = "http://files.spip.org/spip/stable/spip-${version}.zip";
         sha256 = "0cacpxs9nv61i3hzd3nbmplq4mp22s886llhacp3n4923jd6snx5";
       };
       paches = [ ./spip_ldap_patch.patch ];
@@ -119,7 +117,7 @@ let
         rm -rf IMG local tmp config/remove.txt
         ln -sf ${./spip_mes_options.php} config/mes_options.php
         echo "Require all denied" > "config/.htaccess"
-        ln -sf ../../../../../${varDir}/{IMG,local,tmp} .
+        ln -sf ../../../../../${varDir}/{IMG,local} .
       '';
       installPhase = ''
         cp -a . $out
diff --git a/virtual/packages/spip_mes_options.php b/virtual/packages/spip_mes_options.php
index 88ac449..8db8389 100644
--- a/virtual/packages/spip_mes_options.php
+++ b/virtual/packages/spip_mes_options.php
@@ -3,14 +3,15 @@
 // http://www.spip.net/fr_article3811.html
 
 $config_dir = getenv('SPIP_CONFIG_DIR') . '/';
+$var_dir = getenv('SPIP_VAR_DIR') . '/';
 
-$cookie_prefix = str_replace('.', '_', $site);
+$cookie_prefix = str_replace('.', '_', getenv("SPIP_SITE"));
 $table_prefix = 'spip';
 
 spip_initialisation(
         $config_dir,
         _DIR_RACINE . _NOM_PERMANENTS_ACCESSIBLES,
-        _DIR_RACINE . _NOM_TEMPORAIRES_INACCESSIBLES,
+        $var_dir . _NOM_TEMPORAIRES_INACCESSIBLES,
         _DIR_RACINE . _NOM_TEMPORAIRES_ACCESSIBLES
 );
 
-- 
2.41.0