1 |
diff -Nur smeserver-phpvirtualbox-4.3-4.3.0-old/root/etc/e-smith/db/configuration/defaults/phpvirtualbox/webauth smeserver-phpvirtualbox-4.3-4.3.0/root/etc/e-smith/db/configuration/defaults/phpvirtualbox/webauth |
2 |
--- smeserver-phpvirtualbox-4.3-4.3.0-old/root/etc/e-smith/db/configuration/defaults/phpvirtualbox/webauth 1970-01-01 01:00:00.000000000 +0100 |
3 |
+++ smeserver-phpvirtualbox-4.3-4.3.0/root/etc/e-smith/db/configuration/defaults/phpvirtualbox/webauth 2013-12-13 23:14:52.000000000 +0100 |
4 |
@@ -0,0 +1 @@ |
5 |
+disabled |
6 |
diff -Nur smeserver-phpvirtualbox-4.3-4.3.0-old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/92phpvirtualhost smeserver-phpvirtualbox-4.3-4.3.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/92phpvirtualhost |
7 |
--- smeserver-phpvirtualbox-4.3-4.3.0-old/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/92phpvirtualhost 2013-12-13 23:19:03.000000000 +0100 |
8 |
+++ smeserver-phpvirtualbox-4.3-4.3.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/92phpvirtualhost 2013-12-13 23:14:52.000000000 +0100 |
9 |
@@ -26,6 +26,8 @@ |
10 |
$OUT .= " allow from $localAccess\n"; |
11 |
$OUT .= " php_admin_value upload_tmp_dir /tmp\n"; |
12 |
|
13 |
+ if ($phpvirtualbox{'webauth'} eq 'enabled') |
14 |
+ { |
15 |
$OUT .= " AuthName \"$name\"\n"; |
16 |
$OUT .= " AuthType Basic\n"; |
17 |
$OUT .= " AuthExternal pwauth\n"; |
18 |
@@ -34,7 +36,7 @@ |
19 |
$OUT .= " require user $phpvirtualbox{'User'}\n"; |
20 |
$OUT .= " require group $phpvirtualbox{'Group'}\n"; |
21 |
$OUT .= " Satisfy $satisfy\n"; |
22 |
- |
23 |
+ } |
24 |
$OUT .= " AddType application/x-httpd-php .php\n"; |
25 |
$OUT .= " php_admin_value open_basedir /opt/phpvirtualbox\n"; |
26 |
$OUT .= " php_admin_value eaccelerator.enable 1\n"; |