diff -ruN e-smith-horde-4.4.0-latest/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/85HordeAccess e-smith-horde-4.4.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/85HordeAccess
--- e-smith-horde-4.4.0-latest/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/85HordeAccess 2013-12-20 20:35:57.000000000 -0800
+++ e-smith-horde-4.4.0/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/85HordeAccess 2013-12-20 20:08:40.000000000 -0800
@@ -9,34 +9,33 @@
if (!defined $PHPStatus or $PHPStatus ne 'enabled')
{
- $OUT .= "# Error: horde is enabled but PHP is not enabled.";
+ $OUT .= "# Error: horde is enabled but PHP is not enabled.";
}
elsif (defined $status && $status eq 'enabled')
{
- $OUT .= qq(
+ $OUT .= qq(
# Horde specific configuration files.
- Order Deny,Allow
- Deny from all
+ Order Deny,Allow
+ Deny from all
Options Indexes Includes FollowSymLinks
AllowOverride None
order deny,allow
deny from all
);
- $OUT .= " allow from ";
+ $OUT .= " allow from ";
$OUT .= ( $horde{access} eq "public" ) ? "all" : $localAccess;
$OUT .= "\n";
$OUT .= qq(
AddType application/x-httpd-php .php .php3
- php_value include_path '/usr/share/pear-addons:/usr/share/pear'
-# php_value auto_prepend_file /home/httpd/horde-phplib/prepend.php3
- php_flag magic_quotes_gpc off
- php_flag track_vars on
- php_flag session.use_trans_sid off
- php_admin_flag allow_url_fopen on
+ php_value include_path '/usr/share/pear-addons:/usr/share/pear'
+ php_flag magic_quotes_gpc off
+ php_flag track_vars on
+ php_flag session.use_trans_sid off
+ php_admin_flag allow_url_fopen on
@@ -68,6 +67,6 @@
}
else
{
- $OUT .= "# horde not configured as it is disabled in the config db";
+ $OUT .= "# horde not configured as it is disabled in the config db";
}
}