clones/Froxlor
1
0
Fork 0
mirror of https://github.com/Froxlor/Froxlor.git synced 2024-09-21 18:37:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixing it on the right place, d00p was correct, i apologize -.-

Browse Source
This commit is contained in:
Florian Aders (EleRas) 2010-05-19 12:29:32 +00:00
parent 5a0973dfa3
commit f6f7b2e4be
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
install/install.php
View File

@ -629,7 +629,6 @@ if(isset($_POST['installstep'])
$db->query("UPDATE `" . TABLE_PANEL_SETTINGS . "` SET `value` = '/etc/apache2/sites-enabled/' WHERE `settinggroup` = 'system' AND `varname` = 'apacheconf_diroptions'");
$db->query("UPDATE `" . TABLE_PANEL_SETTINGS . "` SET `value` = '/etc/apache2/froxlor-htpasswd/' WHERE `settinggroup` = 'system' AND `varname` = 'apacheconf_htpasswddir'");
$db->query("UPDATE `" . TABLE_PANEL_SETTINGS . "` SET `value` = '/etc/init.d/apache2 reload' WHERE `settinggroup` = 'system' AND `varname` = 'apachereload_command'");
$ssettings = 'DocumentRoot \"".$db->escape(dirname(dirname(__FILE__))) . "\"';
}
elseif($webserver == "lighttpd")
{
@ -661,8 +660,7 @@ if(isset($_POST['installstep'])
`port` = '80',
`namevirtualhost_statement` = '1',
`vhostcontainer` = '1',
`vhostcontainer_servername_statement` = '1',
`specialsettings` = '".$ssettings."'";
`vhostcontainer_servername_statement` = '1'";
$db->query($query);
$defaultip = $db->insert_id();

2
scripts/jobs/cron_tasks.inc.http.10.apache.php
View File

@ -177,7 +177,7 @@ class apache
/**
* add 'real'-vhost content here, like doc-root :)
*/
$mypath = makeCorrectDir(dirname(dirname(dirname(__FILE__))));
$mypath = makeCorrectDir(dirname(dirname(dirname(dirname(__FILE__)))));
$this->virtualhosts_data[$vhosts_filename].= 'DocumentRoot "'.$mypath.'"'."\n";
if($row_ipsandports['vhostcontainer_servername_statement'] == '1')

2
scripts/jobs/cron_tasks.inc.http.20.lighttpd.php
View File

@ -107,7 +107,7 @@ class lighttpd
$this->lighttpd_data[$vhost_filename].= '# Froxlor default vhost' . "\n";
$this->lighttpd_data[$vhost_filename].= '$HTTP["host"] =~ "^(?:www\.|)' . $myhost . '$" {' . "\n";
$mypath = makeCorrectDir(dirname(dirname(dirname(__FILE__))));
$mypath = makeCorrectDir(dirname(dirname(dirname(dirname(__FILE__)))));
$this->lighttpd_data[$vhost_filename].= ' server.document-root = "'.$mypath.'"'."\n";
/**