diff --git a/FAQ b/FAQ index 910a2818073b405ec3e45123aa69a74c4cdeec0d..d40280124ec40c443cf775c60990e6fc3e842393 100644 --- a/FAQ +++ b/FAQ @@ -122,13 +122,13 @@ A: There's the possibility to add a password hook in fusiondirectory.conf's main Q: What about templates for vacation messages? A: Create a directory to keep a set of vacation messages which are readable by the - user that runs your apache. In this example I'll use /etc/fusiondirectory/vacation for that. + user that runs your apache. In this example I'll use /var/cache/fusiondirectory/vacation for that. Put your vacation files in there containing a "DESC:some descriptive text" as the first line followed by the normal vacation text. You can use all attributes from the generic tab. I.e.: - /etc/fusiondirectory/vacation/business.txt + /var/cache/fusiondirectory/vacation/business.txt |--> DESC:Away from desk @@ -139,7 +139,7 @@ A: Create a directory to keep a set of vacation messages which are readable by t %givenName %sn |<-- - Place the config option vacationTemplateDirectory="/etc/fusiondirectory/vacation" in the location found in + Place the config option vacationTemplateDirectory="/var/cache/fusiondirectory/vacation" in the location found in fusiondirectory.conf and a template box is show in the vacation mail tab. diff --git a/contrib/man/fusiondirectory.conf.5 b/contrib/man/fusiondirectory.conf.5 index f9aec17dada34ab402e7d84ba4b93f0a62ca199c..1466a3fac43cbb7fe46f3b9e08946462328eee7f 100644 --- a/contrib/man/fusiondirectory.conf.5 +++ b/contrib/man/fusiondirectory.conf.5 @@ -1222,9 +1222,9 @@ description for more details. The .I vacationTemplateDirectory statement sets the path where FusionDirectory will look for vacation message -templates. Default is /etc/fusiondirectory/vacation. +templates. Default is /var/cache/fusiondirectory/vacation. -Example template /etc/fusiondirectory/vacation/business.txt: +Example template /varc/cache/fusiondirectory/vacation/business.txt: .nf DESC:Away from desk diff --git a/include/variables.inc b/include/variables.inc index 20eba09e824db09fc45a8c15f12f001e62c2bc5c..29945e1047958601af328982d66778cb322f78a5 100644 --- a/include/variables.inc +++ b/include/variables.inc @@ -58,6 +58,9 @@ define ("CONFIG_TEMPLATE_DIR", "/var/cache/fusiondirectory/template/"); /* Directory containing the fai logs */ define ("FAI_LOG_DIR", "/var/cache/fusiondirectory/fai/"); +/* Directory containing the vacation files */ +define ("VACATION_DIR", "/var/cache/fusiondirectory/vacation/"); + /* fpdf library path */ define("FPDF","/usr/share/php/fpdf/fpdf.php"); diff --git a/setup/class_setupStep_Config2.inc b/setup/class_setupStep_Config2.inc index 7c6d316c07c9cd8d964574b83842d6b5a71d7d9d..45f2555b86af5192728a9126ecbfe123620ba8d6 100644 --- a/setup/class_setupStep_Config2.inc +++ b/setup/class_setupStep_Config2.inc @@ -31,7 +31,7 @@ class Step_Config2 extends setup_step var $mail = "none"; var $mail_attrib = ""; var $mail_methods = array(); - var $mail_settings = array("vacationdir" => "/etc/fusiondirectory/vacation", + var $mail_settings = array("vacationdir" => VACATION_DIR, "vacationdir_active" => FALSE); var $generic_settings = array( "wws_ou" => "ou=winstations",