/[smeserver]/rpms/e-smith-ibays/sme9/e-smith-ibays-2.4.0_add_php_values_and_SSLRequireSSL.patch
ViewVC logotype

Contents of /rpms/e-smith-ibays/sme9/e-smith-ibays-2.4.0_add_php_values_and_SSLRequireSSL.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph

Revision 1.2 - (show annotations) (download)
Tue Apr 8 20:05:03 2014 UTC (10 years, 6 months ago) by stephdl
Branch: MAIN
CVS Tags: e-smith-ibays-2_4_0-14_el6_sme, e-smith-ibays-2_4_0-12_el6_sme, e-smith-ibays-2_4_0-13_el6_sme, e-smith-ibays-2_4_0-11_el6_sme, HEAD
Changes since 1.1: +14 -14 lines
Error occurred while calculating annotation data. 
Perl::critic syntax modifications  [SME: 8239]
1 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
2 --- 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
3 +++ 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
4 @@ -93,6 +93,16 @@
5 my $followSymLinks = $properties{'FollowSymLinks'} || "disabled";
6 my $indexes = $properties{'Indexes'} || "enabled";
7 my $sslRequireSSL = $properties{'SSLRequireSSL'} || "disabled";
8 + my $ssldb = $properties{'SSL'} || 'disabled';
9 +
10 +###php values for each ibay or set 'disabled' if not defined
11 + my $allowurlfopen = $properties{'AllowUrlfOpen'} || 'disabled';
12 + my $memoryLimit = $properties{'MemoryLimit'} || 'disabled';
13 + my $upmaxfileSize = $properties{'UpMaxFileSize'} || 'disabled';
14 + my $postmaxSize = $properties{'PostMaxSize'} || 'disabled';
15 + my $maxexecutionTime = $properties{'MaxExecTime'} || 'disabled';
16 + $maxexecutionTime = '0' if $maxexecutionTime eq 'unlimited';
17 +
18 $OUT .= "\n";
19 $OUT .= "#------------------------------------------------------------\n";
20 $OUT .= "# $key ibay directories ($properties{'Name'})\n";
21 @@ -100,7 +110,7 @@
22
23 $OUT .= "\n";
24 $OUT .= "<Directory /home/e-smith/files/ibays/$key/html>\n";
25 - if ($sslRequireSSL eq 'enabled')
26 + if (($sslRequireSSL eq 'enabled') || ($ssldb eq 'enabled'))
27 {
28 $OUT .=" SSLRequireSSL\n";
29 }
30 @@ -108,8 +118,13 @@
31 $OUT .= " Options +Indexes\n" if ($indexes eq 'enabled');
32 $OUT .= " Options +FollowSymLinks\n" if ($followSymLinks eq 'enabled');
33 if ($dynamicContent eq 'enabled')
34 - {
35 + {
36 $OUT .= " Options +Includes\n";
37 + $OUT .= " php_admin_flag allow_url_fopen on\n" if ($allowurlfopen eq 'enabled');
38 + $OUT .= " php_admin_value memory_limit $memoryLimit\n" if ($memoryLimit ne 'disabled');
39 + $OUT .= " php_admin_value upload_max_filesize $upmaxfileSize\n" if ($upmaxfileSize ne 'disabled');
40 + $OUT .= " php_admin_value post_max_size $postmaxSize\n" if ($postmaxSize ne 'disabled');
41 + $OUT .= " php_admin_value max_execution_time $maxexecutionTime\n" if ($maxexecutionTime ne 'disabled');
42 }
43 else
44 {
admin@koozali.org
 ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed