From 785f7afbaffa69af85b21c6100cc12919e6af14b Mon Sep 17 00:00:00 2001 From: Axel ROGER Date: Tue, 2 Apr 2013 13:17:12 +0000 Subject: [PATCH] Panel's logs and webservers' logs can't be separated --- bureau/class/config.php | 1 + bureau/class/m_log.php | 2 +- debian/alternc.postinst | 2 ++ 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/bureau/class/config.php b/bureau/class/config.php index 3c10fdd6..b5443cf5 100644 --- a/bureau/class/config.php +++ b/bureau/class/config.php @@ -98,6 +98,7 @@ require_once(dirname(__FILE__)."/local.php"); define('ALTERNC_MAIL', "$L_ALTERNC_MAIL"); define('ALTERNC_HTML', "$L_ALTERNC_HTML"); define('ALTERNC_LOGS', "$L_ALTERNC_LOGS"); +define('WEBSERVERS_LOGS', "$L_WEBSERVERS_LOGS"); define('ALTERNC_PANEL', "/usr/share/alternc/panel"); define('ALTERNC_LOCALES', ALTERNC_PANEL."/locales"); diff --git a/bureau/class/m_log.php b/bureau/class/m_log.php index 1f27335b..263b84a2 100644 --- a/bureau/class/m_log.php +++ b/bureau/class/m_log.php @@ -81,7 +81,7 @@ class m_log { global $cuid,$mem,$err; $err->log("log","get_logs_directory"); // Return an array to allow multiple directory in the future - $c=array("dir"=>ALTERNC_LOGS."/".$cuid."-".$mem->user["login"]); + $c=array("dir"=>WEBSERVERS_LOGS."/".$cuid."-".$mem->user["login"]); return $c; } diff --git a/debian/alternc.postinst b/debian/alternc.postinst index 934f116b..4424df2a 100644 --- a/debian/alternc.postinst +++ b/debian/alternc.postinst @@ -123,6 +123,7 @@ INOTIFY_UPDATE_DOMAIN="/var/run/alternc/inotify_update_domain.lock" ALTERNC_HTML="" ALTERNC_MAIL="" ALTERNC_LOGS="" +WEBSERVERS_LOGS="" EOF @@ -154,6 +155,7 @@ EOF update_var alternc/alternc_html ALTERNC_HTML update_var alternc/alternc_mail ALTERNC_MAIL update_var alternc/alternc_logs ALTERNC_LOGS + update_var alternc/alternc_logs WEBSERVERS_LOGS sed -e "$SED_SCRIPT" < $CONFIGFILE > $CONFIGFILE.tmp mv -f $CONFIGFILE.tmp $CONFIGFILE