Commit 99d18e63 authored by Benoit Mortier's avatar Benoit Mortier
Browse files

Fixes: #521 the vacation dir should be a in variables.inc also

Showing with 9 additions and 6 deletions
+9 -6
......@@ -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.
......
......@@ -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
......
......@@ -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");
......
......@@ -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",
......
  • bmortier @bmortier

    mentioned in issue #201

    By bmortier on 2017-09-02T14:40:04 (imported from GitLab)

    ·

    mentioned in issue #201

    By bmortier on 2017-09-02T14:40:04 (imported from GitLab)

    Toggle commit list
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment