X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fwebsites%2Fphp-application.nix;h=caecb6f85f748d9b9fa5a159af10ce45381cc415;hb=bbea22c02b6c059a6be1064391f06737ee244ba6;hp=b9d988665bd327b58f00ead097cd3ea14fd04791;hpb=17c6ac45b0c4333dc774228a2837699de9443f8d;p=perso%2FImmae%2FConfig%2FNix.git diff --git a/modules/websites/php-application.nix b/modules/websites/php-application.nix index b9d9886..caecb6f 100644 --- a/modules/websites/php-application.nix +++ b/modules/websites/php-application.nix @@ -33,11 +33,6 @@ in Mode to apply to the vardir ''; }; - phpSession = mkOption { - type = bool; - default = true; - description = "Handle phpsession files separately in vardir"; - }; phpListen = mkOption { type = nullOr str; default = null; @@ -159,7 +154,6 @@ in "listen.group" = icfg.httpdGroup; "php_admin_value[open_basedir]" = builtins.concatStringsSep ":" ([icfg.app icfg.varDir] ++ icfg.phpWatchFiles ++ icfg.phpOpenbasedir); } - // optionalAttrs (icfg.phpSession) { "php_admin_value[session.save_path]" = "${icfg.varDir}/phpSessions"; } // icfg.phpPool; phpOptions = config.services.phpfpm.phpOptions + icfg.phpOptions; inherit (icfg) phpEnv phpPackage; @@ -208,8 +202,6 @@ in deps = []; text = optionalString (!isNull icfg.varDir) '' install -m ${icfg.mode} -o ${icfg.httpdUser} -g ${icfg.httpdGroup} -d ${icfg.varDir} - '' + optionalString (icfg.phpSession) '' - install -m 0700 -o ${icfg.httpdUser} -g ${icfg.httpdGroup} -d ${icfg.varDir}/phpSessions '' + builtins.concatStringsSep "\n" (attrsets.mapAttrsToList (n: v: '' install -m ${v} -o ${icfg.httpdUser} -g ${icfg.httpdGroup} -d ${icfg.varDir}/${n} '') icfg.varDirPaths);