- determine correct path of Froxlor in webserver-cron, fixes #270
This commit is contained in:
@@ -192,7 +192,7 @@ class apache
|
|||||||
/**
|
/**
|
||||||
* add 'real'-vhost content here, like doc-root :)
|
* add 'real'-vhost content here, like doc-root :)
|
||||||
*/
|
*/
|
||||||
$mypath = makeCorrectDir(dirname(dirname(dirname(dirname(__FILE__)))));
|
$mypath = makeCorrectDir(dirname(dirname(dirname(__FILE__))));
|
||||||
$this->virtualhosts_data[$vhosts_filename].= 'DocumentRoot "'.$mypath.'"'."\n";
|
$this->virtualhosts_data[$vhosts_filename].= 'DocumentRoot "'.$mypath.'"'."\n";
|
||||||
|
|
||||||
if($row_ipsandports['vhostcontainer_servername_statement'] == '1')
|
if($row_ipsandports['vhostcontainer_servername_statement'] == '1')
|
||||||
|
|||||||
@@ -107,7 +107,7 @@ class lighttpd
|
|||||||
$this->lighttpd_data[$vhost_filename].= '# Froxlor default vhost' . "\n";
|
$this->lighttpd_data[$vhost_filename].= '# Froxlor default vhost' . "\n";
|
||||||
$this->lighttpd_data[$vhost_filename].= '$HTTP["host"] =~ "^(?:www\.|)' . $myhost . '$" {' . "\n";
|
$this->lighttpd_data[$vhost_filename].= '$HTTP["host"] =~ "^(?:www\.|)' . $myhost . '$" {' . "\n";
|
||||||
|
|
||||||
$mypath = makeCorrectDir(dirname(dirname(dirname(dirname(__FILE__)))));
|
$mypath = makeCorrectDir(dirname(dirname(dirname(__FILE__))));
|
||||||
$this->lighttpd_data[$vhost_filename].= ' server.document-root = "'.$mypath.'"'."\n";
|
$this->lighttpd_data[$vhost_filename].= ' server.document-root = "'.$mypath.'"'."\n";
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
Reference in New Issue
Block a user