Squash changes containing private information

[perso/Immae/Config/Nix.git] / systems / eldiron / websites / dav / davical.nix

diff --git a/modules/private/websites/tools/dav/davical.nix b/systems/eldiron/websites/dav/davical.nix
similarity index 93%
rename from modules/private/websites/tools/dav/davical.nix
rename to systems/eldiron/websites/dav/davical.nix
index bc5ecf695bf5aed35d303ce199d5d0503f70c71e..b418cb8359c367536e8f0f0ccd19020aac2c98af 100644 (file)
--- a/modules/private/websites/tools/dav/davical.nix
+++ b/systems/eldiron/websites/dav/davical.nix
@@ -1,11 +1,5 @@
 { stdenv, fetchurl, gettext, writeText, env, awl, davical, config }:
 rec {
-  activationScript = {
-    deps = [ "httpd" ];
-    text = ''
-      install -m 0755 -o ${apache.user} -g ${apache.group} -d /var/lib/php/sessions/davical
-      '';
-  };
   keys."webapps/dav-davical" = {
     user = apache.user;
     group = apache.group;
@@ -120,9 +114,10 @@ rec {
 
       # Needed to avoid clashes in browser cookies (same domain)
       "php_value[session.name]" = "DavicalPHPSESSID";
-      "php_admin_value[open_basedir]" = "${basedir}:/tmp:/var/lib/php/sessions/davical";
+      "php_admin_value[open_basedir]" = "${basedir}:/tmp";
       "php_admin_value[include_path]" = "${awl}/inc:${webapp}/inc";
-      "php_admin_value[session.save_path]" = "/var/lib/php/sessions/davical";
+      "php_admin_value[session.save_handler]" = "redis";
+      "php_admin_value[session.save_path]" = "'unix:///run/redis-php-sessions/redis.sock?persistent=1&prefix=Tools:Davical:'";
       "php_flag[magic_quotes_gpc]" = "Off";
       "php_flag[register_globals]" = "Off";
       "php_admin_value[error_reporting]" = "E_ALL & ~E_NOTICE";