Skip to content

Commit 37d7556

Browse files
committed
Changed symlink for apache logfile as vlogger is not able to log in a directory that is a symlink.
1 parent 35bcf20 commit 37d7556

File tree

1 file changed

+15
-0
lines changed

1 file changed

+15
-0
lines changed

server/plugins-available/apache2_plugin.inc.php

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -217,6 +217,20 @@ function update($event_name,$data) {
217217
if(!is_dir($data["new"]["document_root"]."/cgi-bin")) exec("mkdir -p ".$data["new"]["document_root"]."/cgi-bin");
218218

219219
// Remove the symlink for the site, if site is renamed
220+
if($this->action == 'update' && $data["old"]["domain"] != '' && $data["new"]["domain"] != $data["old"]["domain"]) {
221+
if(is_dir('/var/log/ispconfig/httpd/'.$data["old"]["domain"])) exec('rm -rf /var/log/ispconfig/httpd/'.$data["old"]["domain"]);
222+
if(is_link($data["old"]["document_root"]."/log")) unlink($data["old"]["document_root"]."/log");
223+
}
224+
225+
// Create the symlink for the logfiles
226+
if(!is_dir('/var/log/ispconfig/httpd/'.$data["new"]["domain"])) exec('mkdir -p /var/log/ispconfig/httpd/'.$data["new"]["domain"]);
227+
if(!is_link($data["new"]["document_root"]."/log")) {
228+
exec("ln -s /var/log/ispconfig/httpd/".$data["new"]["domain"]." ".$data["new"]["document_root"]."/log");
229+
$app->log("Creating Symlink: ln -s /var/log/ispconfig/httpd/".$data["new"]["domain"]." ".$data["new"]["document_root"]."/log",LOGLEVEL_DEBUG);
230+
}
231+
/*
232+
// Create the symlink for the logfiles
233+
// This does not work as vlogger can not log trogh symlinks.
220234
if($this->action == 'update' && $data["old"]["domain"] != '' && $data["new"]["domain"] != $data["old"]["domain"]) {
221235
if(is_dir($data["old"]["document_root"]."/log")) exec('rm -rf '.$data["old"]["document_root"]."/log");
222236
if(is_link('/var/log/ispconfig/httpd/'.$data["old"]["domain"])) unlink('/var/log/ispconfig/httpd/'.$data["old"]["domain"]);
@@ -228,6 +242,7 @@ function update($event_name,$data) {
228242
exec("ln -s ".$data["new"]["document_root"]."/log /var/log/ispconfig/httpd/".$data["new"]["domain"]);
229243
$app->log("Creating Symlink: ln -s ".$data["new"]["document_root"]."/log /var/log/ispconfig/httpd/".$data["new"]["domain"],LOGLEVEL_DEBUG);
230244
}
245+
*/
231246

232247
// Get the client ID
233248
$client = $app->db->queryOneRecord("SELECT client_id FROM sys_group WHERE sys_group.groupid = ".intval($data["new"]["sys_groupid"]));

0 commit comments

Comments
 (0)