diff -Nur e-smith-ibays-2.4.0.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/90e-smithAccess40ibays e-smith-ibays-2.4.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/90e-smithAccess40ibays --- e-smith-ibays-2.4.0.old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/90e-smithAccess40ibays 2014-03-09 09:40:02.816435745 +0100 +++ e-smith-ibays-2.4.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/90e-smithAccess40ibays 2014-03-09 15:45:21.500197096 +0100 @@ -93,6 +93,16 @@ my $followSymLinks = $properties{'FollowSymLinks'} || "disabled"; my $indexes = $properties{'Indexes'} || "enabled"; my $sslRequireSSL = $properties{'SSLRequireSSL'} || "disabled"; + my $ssldb = $properties{'SSL'} || 'disabled'; + +###php values for each ibay or set 'disabled' if not defined + my $allowurlfopen = $properties{'AllowUrlfOpen'} || 'disabled'; + my $memoryLimit = $properties{'MemoryLimit'} || 'disabled'; + my $upmaxfileSize = $properties{'UpMaxFileSize'} || 'disabled'; + my $postmaxSize = $properties{'PostMaxSize'} || 'disabled'; + my $maxexecutionTime = $properties{'MaxExecTime'} || 'disabled'; + $maxexecutionTime = '0' if $maxexecutionTime eq 'unlimited'; + $OUT .= "\n"; $OUT .= "#------------------------------------------------------------\n"; $OUT .= "# $key ibay directories ($properties{'Name'})\n"; @@ -100,7 +110,7 @@ $OUT .= "\n"; $OUT .= "\n"; - if ($sslRequireSSL eq 'enabled') + if (($sslRequireSSL eq 'enabled') || ($ssldb eq 'enabled')) { $OUT .=" SSLRequireSSL\n"; } @@ -108,8 +118,13 @@ $OUT .= " Options +Indexes\n" if ($indexes eq 'enabled'); $OUT .= " Options +FollowSymLinks\n" if ($followSymLinks eq 'enabled'); if ($dynamicContent eq 'enabled') - { + { $OUT .= " Options +Includes\n"; + $OUT .= " php_admin_flag allow_url_fopen on\n" if ($allowurlfopen eq 'enabled'); + $OUT .= " php_admin_value memory_limit $memoryLimit\n" if ($memoryLimit ne 'disabled'); + $OUT .= " php_admin_value upload_max_filesize $upmaxfileSize\n" if ($upmaxfileSize ne 'disabled'); + $OUT .= " php_admin_value post_max_size $postmaxSize\n" if ($postmaxSize ne 'disabled'); + $OUT .= " php_admin_value max_execution_time $maxexecutionTime\n" if ($maxexecutionTime ne 'disabled'); } else {