--- rpms/smeserver-user-webspace/contribs8/smeserver-user-webspace-0.1.patch3 2013/10/27 23:09:14 1.1 +++ rpms/smeserver-user-webspace/contribs8/smeserver-user-webspace-0.1.patch3 2013/11/24 09:03:23 1.3 @@ -1,21 +1,21 @@ -diff -Nur smeserver-user-webspace-0.1/root/etc/e-smith/db/configuration/default/UserPublicWeb/php smeserver-user-webspace-0.1.new/root/etc/e-smith/db/configuration/default/UserPublicWeb/php ---- smeserver-user-webspace-0.1/root/etc/e-smith/db/configuration/default/UserPublicWeb/php 1969-12-31 17:00:00.000000000 -0700 -+++ smeserver-user-webspace-0.1.new/root/etc/e-smith/db/configuration/default/UserPublicWeb/php 2013-10-27 16:34:28.002390969 -0600 +diff -Nur smeserver-user-webspace-0.1/root/etc/e-smith/db/configuration/defaults[21~/UserPublicWeb/php smeserver-user-webspace-0.1.new/root/etc/e-smith/db/configuration/defaults/UserPublicWeb/php +--- smeserver-user-webspace-0.1/root/etc/e-smith/db/configuration/defaults/UserPublicWeb/php 1969-12-31 17:00:00.000000000 -0700 ++++ smeserver-user-webspace-0.1.new/root/etc/e-smith/db/configuration/defaults/UserPublicWeb/php 2013-10-27 16:34:28.002390969 -0600 @@ -0,0 +1 @@ +enabled -diff -Nur smeserver-user-webspace-0.1/root/etc/e-smith/db/configuration/default/UserPublicWeb/PublicAccess smeserver-user-webspace-0.1.new/root/etc/e-smith/db/configuration/default/UserPublicWeb/PublicAccess ---- smeserver-user-webspace-0.1/root/etc/e-smith/db/configuration/default/UserPublicWeb/PublicAccess 1969-12-31 17:00:00.000000000 -0700 -+++ smeserver-user-webspace-0.1.new/root/etc/e-smith/db/configuration/default/UserPublicWeb/PublicAccess 2013-10-27 16:35:34.386597294 -0600 +diff -Nur smeserver-user-webspace-0.1/root/etc/e-smith/db/configuration/defaults/UserPublicWeb/PublicAccess smeserver-user-webspace-0.1.new/root/etc/e-smith/db/configuration/defaults/UserPublicWeb/PublicAccess +--- smeserver-user-webspace-0.1/root/etc/e-smith/db/configuration/defaults/UserPublicWeb/PublicAccess 1969-12-31 17:00:00.000000000 -0700 ++++ smeserver-user-webspace-0.1.new/root/etc/e-smith/db/configuration/defaults/UserPublicWeb/PublicAccess 2013-10-27 16:35:34.386597294 -0600 @@ -0,0 +1 @@ +local -diff -Nur smeserver-user-webspace-0.1/root/etc/e-smith/db/configuration/default/UserPublicWeb/status smeserver-user-webspace-0.1.new/root/etc/e-smith/db/configuration/default/UserPublicWeb/status ---- smeserver-user-webspace-0.1/root/etc/e-smith/db/configuration/default/UserPublicWeb/status 1969-12-31 17:00:00.000000000 -0700 -+++ smeserver-user-webspace-0.1.new/root/etc/e-smith/db/configuration/default/UserPublicWeb/status 2013-10-27 16:34:36.753412561 -0600 +diff -Nur smeserver-user-webspace-0.1/root/etc/e-smith/db/configuration/defaults/UserPublicWeb/status smeserver-user-webspace-0.1.new/root/etc/e-smith/db/configuration/defaults/UserPublicWeb/status +--- smeserver-user-webspace-0.1/root/etc/e-smith/db/configuration/defaults/UserPublicWeb/status 1969-12-31 17:00:00.000000000 -0700 ++++ smeserver-user-webspace-0.1.new/root/etc/e-smith/db/configuration/defaults/UserPublicWeb/status 2013-10-27 16:34:36.753412561 -0600 @@ -0,0 +1 @@ +enabled -diff -Nur smeserver-user-webspace-0.1/root/etc/e-smith/db/configuration/default/UserPublicWeb/type smeserver-user-webspace-0.1.new/root/etc/e-smith/db/configuration/default/UserPublicWeb/type ---- smeserver-user-webspace-0.1/root/etc/e-smith/db/configuration/default/UserPublicWeb/type 1969-12-31 17:00:00.000000000 -0700 -+++ smeserver-user-webspace-0.1.new/root/etc/e-smith/db/configuration/default/UserPublicWeb/type 2013-10-27 16:33:58.712282844 -0600 +diff -Nur smeserver-user-webspace-0.1/root/etc/e-smith/db/configuration/defaults/UserPublicWeb/type smeserver-user-webspace-0.1.new/root/etc/e-smith/db/configuration/defaults/UserPublicWeb/type +--- smeserver-user-webspace-0.1/root/etc/e-smith/db/configuration/defaults/UserPublicWeb/type 1969-12-31 17:00:00.000000000 -0700 ++++ smeserver-user-webspace-0.1.new/root/etc/e-smith/db/configuration/defaults/UserPublicWeb/type 2013-10-27 16:33:58.712282844 -0600 @@ -0,0 +1 @@ +service diff -Nur smeserver-user-webspace-0.1/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/20LoadModule85userdir smeserver-user-webspace-0.1.new/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/20LoadModule85userdir @@ -118,7 +118,7 @@ diff -Nur smeserver-user-webspace-0.1/ro + $result .= " AllowOverride FileInfo AuthConfig Limit\n"; + $result .= " Options MultiViews Indexes SymLinksIfOwnerMatch IncludesNoExec\n"; + -+ my $phpexec = $properties{''} || $phpglobal; ++ my $phpexec = $properties{'php'} || $phpglobal; + $result .= " AddType application/x-httpd-php .php .php3 .phtml\n" if $phpexec eq "enabled"; + $result .= " AddType application/x-httpd-php-source .phps\n" if $phpexec eq "enabled"; + $result .= " php_admin_value open_basedir /home/e-smith/files/users/$key/home/public_html/:/home/e-smith/files/users/$key/tmp/:/usr/share/pear\n";