From 84e17ab91f8333c3433035c408fb9fc288c1a37a Mon Sep 17 00:00:00 2001 From: "Michael Kaufmann (d00p)" Date: Mon, 28 Feb 2011 21:43:27 +0100 Subject: [PATCH] correct main httpd.conf path, fixes #615 Signed-off-by: Michael Kaufmann (d00p) --- lib/configfiles_index.inc.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/lib/configfiles_index.inc.php b/lib/configfiles_index.inc.php index 8fd0cc04..d5344c23 100644 --- a/lib/configfiles_index.inc.php +++ b/lib/configfiles_index.inc.php @@ -22,13 +22,13 @@ $configcommand = array(); if(isConfigDir($settings['system']['apacheconf_vhost'])) { $configcommand['vhost'] = 'mkdir -p ' . $settings['system']['apacheconf_vhost']; - $configcommand['include'] = 'echo -e "\\nInclude ' . makeCorrectDir($settings['system']['apacheconf_vhost']) . '*.conf" >> ' . makeCorrectFile(makeCorrectDir($settings['system']['apacheconf_vhost']) . '/httpd.conf'); + $configcommand['include'] = 'echo -e "\\nInclude ' . makeCorrectDir($settings['system']['apacheconf_vhost']) . '*.conf" >> ' . makeCorrectFile(makeCorrectDir('/etc/apache2/httpd.conf'); $configcommand['v_inclighty'] = 'echo -e \'\\ninclude_shell "cat ' . makeCorrectDir($settings['system']['apacheconf_vhost']) . '*.conf"\' >> /etc/lighttpd/lighttpd.conf'; } else { $configcommand['vhost'] = 'touch ' . $settings['system']['apacheconf_vhost']; - $configcommand['include'] = 'echo -e "\\nInclude ' . $settings['system']['apacheconf_vhost'] . '" >> ' . makeCorrectFile(dirname($settings['system']['apacheconf_vhost']) . '/httpd.conf'); + $configcommand['include'] = 'echo -e "\\nInclude ' . $settings['system']['apacheconf_vhost'] . '" >> ' . makeCorrectFile('/etc/apache2/httpd.conf'); $configcommand['v_inclighty'] = 'echo -e \'\\ninclude "' . $settings['system']['apacheconf_vhost'] . '"\' >> /etc/lighttpd/lighttpd.conf'; } @@ -47,4 +47,3 @@ $cfgPath = 'lib/configfiles/'; $configfiles = Array(); $configfiles = array_merge(include $cfgPath . 'lenny.inc.php', include $cfgPath . 'hardy.inc.php', include $cfgPath . 'lucid.inc.php', include $cfgPath . 'gentoo.inc.php', include $cfgPath . 'suse10.inc.php', include $cfgPath . 'freebsd.inc.php'); -?> \ No newline at end of file