1 |
diff -Nur -x '*.orig' -x '*.rej' smeserver-shared-folders-0.1/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/shares mezzanine_patched_smeserver-shared-folders-0.1/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/shares |
2 |
--- smeserver-shared-folders-0.1/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/shares 2010-03-08 14:14:10.000000000 +0100 |
3 |
+++ mezzanine_patched_smeserver-shared-folders-0.1/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/shares 2010-03-08 14:09:54.000000000 +0100 |
4 |
@@ -211,7 +211,7 @@ |
5 |
<entry> |
6 |
<base>LABEL_DYNAMIC_CONTENT</base> |
7 |
<trans> |
8 |
- Dynamic content execution (PHP, SSI) |
9 |
+ Dynamic content execution (PHP, CGI, SSI) |
10 |
</trans> |
11 |
</entry> |
12 |
|
13 |
diff -Nur -x '*.orig' -x '*.rej' smeserver-shared-folders-0.1/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/90e-smithAccess50shares mezzanine_patched_smeserver-shared-folders-0.1/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/90e-smithAccess50shares |
14 |
--- smeserver-shared-folders-0.1/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/90e-smithAccess50shares 2010-03-08 14:14:10.000000000 +0100 |
15 |
+++ mezzanine_patched_smeserver-shared-folders-0.1/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/90e-smithAccess50shares 2010-03-08 14:13:45.000000000 +0100 |
16 |
@@ -112,13 +112,12 @@ |
17 |
$OUT .= " php_admin_flag register_globals on\n" if (($properties{PHPRegisterGlobals} || 'disabled') eq 'enabled'); |
18 |
$OUT .= " php_admin_value memory_limit $properties{PHPMemoryLimit}\n" if ($properties{PHPMemoryLimit}); |
19 |
$OUT .= " php_admin_value max_execution_time $properties{PHPMaxExecutionTime}\n" if ($properties{PHPMaxExecutionTime}); |
20 |
- |
21 |
} |
22 |
else |
23 |
{ |
24 |
$OUT .= " DirectoryIndex index.shtml index.htm index.html\n"; |
25 |
$OUT .= " Options +IncludesNOEXEC\n"; |
26 |
- $OUT .= " <FilesMatch \"\\.(php|php3|phtml)\$\">\n"; |
27 |
+ $OUT .= " <FilesMatch \"\\.(php|php3|phtml|cgi|pl)\$\">\n"; |
28 |
$OUT .= " order deny,allow\n"; |
29 |
$OUT .= " Deny from all\n"; |
30 |
$OUT .= " </FilesMatch>\n"; |
31 |
@@ -138,6 +137,17 @@ |
32 |
} |
33 |
|
34 |
$OUT .= "</Directory>\n"; |
35 |
- |
36 |
+ if ($dynamicContent eq 'enabled'){ |
37 |
+ $OUT .= "<DirectoryMatch /home/e-smith/files/shares/$key/files/cgi-bin>\n"; |
38 |
+ $OUT .= " SetHandler cgi-script\n"; |
39 |
+ $OUT .= " Options ExecCGI\n"; |
40 |
+ $OUT .= "</DirectoryMatch>\n"; |
41 |
+ } |
42 |
+ else{ |
43 |
+ $OUT .= "<DirectoryMatch /home/e-smith/files/shares/$key/files/cgi-bin>\n"; |
44 |
+ $OUT .= " order deny,allow\n"; |
45 |
+ $OUT .= " Deny from all\n"; |
46 |
+ $OUT .= "</DirectoryMatch>\n"; |
47 |
+ } |
48 |
} |
49 |
} |