maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

fixed shell_include command for lighttpd (old syscp-bug #1051)

Browse Source
This commit is contained in:
Michael Kaufmann (d00p)
2010-01-30 14:26:31 +00:00
parent dd8d31dff3
commit 3896f9057e
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
TODO
View File

@@ -46,6 +46,7 @@ FIXED 0001154 Wrong configuration set with AWstats an fcgi
FIXED 0001149 Create a Configuration-Option for SPF Records in Zonefiles FIXED 0001149 Create a Configuration-Option for SPF Records in Zonefiles
FIXED 0001095 lighttpd - redirection - "/" slash is added to end of url FIXED 0001095 lighttpd - redirection - "/" slash is added to end of url
FIXED 0001148 Show info for inactive modifications FIXED 0001148 Show info for inactive modifications
FIXED 0001051 include_shell issue in lighttpd 1.4.20
-------------------------------------------------------------------------------------------------------------- --------------------------------------------------------------------------------------------------------------
WONFIX 0001278 Customer and domain directories are not created WONFIX 0001278 Customer and domain directories are not created
WONTFIX 0001056 Need extra payment methods WONTFIX 0001056 Need extra payment methods
@@ -117,7 +118,6 @@ WONTFIX 0001033 Cron-Tasks: creating of php.ini
0001109 no mail traffic is shown and calculated without third party module 0001109 no mail traffic is shown and calculated without third party module
0001101 Default mail qouta - possibillity to set new accounts to amount of webspace 0001101 Default mail qouta - possibillity to set new accounts to amount of webspace
0001084 Add select box to change special logfile setting on domain edit 0001084 Add select box to change special logfile setting on domain edit
0001051 include_shell issue in lighttpd 1.4.20
0001058 Add id/class attributs in <img> tag (left navigation) 0001058 Add id/class attributs in <img> tag (left navigation)
0001043 When creating customer it should also be possible to add domains (merge customer & domain menu) 0001043 When creating customer it should also be possible to add domains (merge customer & domain menu)
0001035 PHP-Error-Log | Adminpanel & CronTask 0001035 PHP-Error-Log | Adminpanel & CronTask

4
lib/configfiles_index.inc.php
View File

@@ -23,7 +23,7 @@ if(isConfigDir($settings['system']['apacheconf_vhost']))
{ {
$configcommand['vhost'] = 'mkdir -p ' . $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($settings['system']['apacheconf_vhost']) . '/httpd.conf');
$configcommand['v_inclighty'] = 'echo -e \'\\ninclude_shell "find ' . makeCorrectDir($settings['system']['apacheconf_vhost']) . ' -maxdepth 1 -name \'*.conf\' -exec cat {} \;"\' >> /etc/lighttpd/lighttpd.conf'; $configcommand['v_inclighty'] = 'echo -e \'\\ninclude_shell "cat ' . makeCorrectDir($settings['system']['apacheconf_vhost']) . '*.conf"\' >> /etc/lighttpd/lighttpd.conf';
} }
else else
{ {
@@ -35,7 +35,7 @@ else
if(isConfigDir($settings['system']['apacheconf_diroptions'])) if(isConfigDir($settings['system']['apacheconf_diroptions']))
{ {
$configcommand['diroptions'] = 'mkdir -p ' . $settings['system']['apacheconf_diroptions']; $configcommand['diroptions'] = 'mkdir -p ' . $settings['system']['apacheconf_diroptions'];
$configcommand['d_inclighty'] = 'echo -e \'\\ninclude_shell "find ' . makeCorrectDir($settings['system']['apacheconf_diroptions']) . ' -maxdepth 1 -name \'*.conf\' -exec cat {} \;"\' >> /etc/lighttpd/lighttpd.conf'; $configcommand['d_inclighty'] = 'echo -e \'\\ninclude_shell "cat ' . makeCorrectDir($settings['system']['apacheconf_diroptions']) . '*.conf"\' >> /etc/lighttpd/lighttpd.conf';
} }
else else
{ {