[pkg-kolab] r482 - kolab-webadmin/trunk/debian

[Peter Eisentraut]

Author: petere
Date: 2006-10-28 11:50:22 +0200 (Sat, 28 Oct 2006)
New Revision: 482

Modified:
   kolab-webadmin/trunk/debian/README.Debian
   kolab-webadmin/trunk/debian/apache.conf
   kolab-webadmin/trunk/debian/changelog
   kolab-webadmin/trunk/debian/session_vars.php
Log:
* Added DirectoryIndex index.php
* Turned off PHP's E_WARNING
* Small clarification in default session_vars.php

Modified: kolab-webadmin/trunk/debian/README.Debian
===================================================================
--- kolab-webadmin/trunk/debian/README.Debian	2006-10-27 13:00:51 UTC (rev 481)
+++ kolab-webadmin/trunk/debian/README.Debian	2006-10-28 09:50:22 UTC (rev 482)
@@ -2,9 +2,9 @@
 
 Then, to activate the web site, in order of preference,
 
-(a) If you have kolab-resource-handlers installed, include
-    /etc/kolab-webadmin/apache.conf into that package's (SSL-enabled)
-    Apache configuration.
+(a) If you have kolab-resource-handlers installed, that package's
+    (SSL-enabled) Apache configuration includes
+    /etc/kolab-webadmin/apache.conf by default.
 
 - or -
 

Modified: kolab-webadmin/trunk/debian/apache.conf
===================================================================
--- kolab-webadmin/trunk/debian/apache.conf	2006-10-27 13:00:51 UTC (rev 481)
+++ kolab-webadmin/trunk/debian/apache.conf	2006-10-28 09:50:22 UTC (rev 482)
@@ -9,5 +9,7 @@
     Options Indexes FollowSymLinks
     Order allow,deny
     Allow from all
+    DirectoryIndex index.php
     php_value include_path /usr/share/kolab-webadmin:.:/usr/share/php
+    php_value error_reporting 'E_ALL & ~E_WARNING & ~E_NOTICE'
 </Directory>

Modified: kolab-webadmin/trunk/debian/changelog
===================================================================
--- kolab-webadmin/trunk/debian/changelog	2006-10-27 13:00:51 UTC (rev 481)
+++ kolab-webadmin/trunk/debian/changelog	2006-10-28 09:50:22 UTC (rev 482)
@@ -1,3 +1,11 @@
+kolab-webadmin (0.4.0-20060810-3) UNRELEASED; urgency=medium
+
+  * Added DirectoryIndex index.php
+  * Turned off PHP's E_WARNING
+  * Small clarification in default session_vars.php
+
+ -- Peter Eisentraut <petere at debian.org>  Sat, 28 Oct 2006 01:52:14 +0200
+
 kolab-webadmin (0.4.0-20060810-2) unstable; urgency=medium
 
   * Restricted permissions on configuration files containing passwords

Modified: kolab-webadmin/trunk/debian/session_vars.php
===================================================================
--- kolab-webadmin/trunk/debian/session_vars.php	2006-10-27 13:00:51 UTC (rev 481)
+++ kolab-webadmin/trunk/debian/session_vars.php	2006-10-28 09:50:22 UTC (rev 482)
@@ -18,11 +18,11 @@
 
 session_start();
 
-$_SESSION['fqdnhostname'] = "Debian";
+$_SESSION['fqdnhostname'] = "kolabserver.example.com";
 $_SESSION['ldap_master_uri'] = "ldap://127.0.0.1:389";
 $_SESSION['base_dn'] = "dc=example,dc=com";
 $_SESSION['php_dn'] = "cn=nobody,cn=internal,dc=example,dc=com";
-$_SESSION['php_pw'] = "...";
+$_SESSION['php_pw'] = "PASSWORD";
 
 
 /***********************************************************************