[pkg-kolab] r1123 - in kolab-webclient/trunk: . debian horde-config

[mparent-guest at alioth.debian.org]

Author: mparent-guest
Date: 2009-01-12 18:10:02 +0000 (Mon, 12 Jan 2009)
New Revision: 1123

Added:
   kolab-webclient/trunk/horde-config/apache.conf
Removed:
   kolab-webclient/trunk/apache.conf
Modified:
   kolab-webclient/trunk/debian/postinst
Log:
apache config is part of horde config


Deleted: kolab-webclient/trunk/apache.conf
===================================================================
--- kolab-webclient/trunk/apache.conf	2009-01-12 18:08:59 UTC (rev 1122)
+++ kolab-webclient/trunk/apache.conf	2009-01-12 18:10:02 UTC (rev 1123)
@@ -1,14 +0,0 @@
-Alias /horde3 "/usr/share/horde3/"
-<Directory "/usr/share/horde3">
-  SSLRequireSSL
-  Options FollowSymLinks
-  AllowOverride Limit
-  Order allow,deny
-  Allow From all
-  php_flag session.auto_start Off
-  php_value error_reporting 'E_ALL & ~E_NOTICE'
-  php_value register_long_arrays Off
-  AddType application/x-httpd-php .php
-  DirectoryIndex index.php
-</Directory>
-

Modified: kolab-webclient/trunk/debian/postinst
===================================================================
--- kolab-webclient/trunk/debian/postinst	2009-01-12 18:08:59 UTC (rev 1122)
+++ kolab-webclient/trunk/debian/postinst	2009-01-12 18:10:02 UTC (rev 1123)
@@ -5,6 +5,10 @@
 
 set -e
 
+initialize_horde_db() {
+	#sqlite $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/storage/horde.db < scripts/sql/groupware.sql
+}
+
 # summary of how this script can be called:
 #        * <postinst> `configure' <most-recently-configured-version>
 #        * <old-postinst> `abort-upgrade' <new version>

Copied: kolab-webclient/trunk/horde-config/apache.conf (from rev 1122, kolab-webclient/trunk/apache.conf)
===================================================================
--- kolab-webclient/trunk/horde-config/apache.conf	                        (rev 0)
+++ kolab-webclient/trunk/horde-config/apache.conf	2009-01-12 18:10:02 UTC (rev 1123)
@@ -0,0 +1,14 @@
+Alias /horde3 "/usr/share/horde3/"
+<Directory "/usr/share/horde3">
+  SSLRequireSSL
+  Options FollowSymLinks
+  AllowOverride Limit
+  Order allow,deny
+  Allow From all
+  php_flag session.auto_start Off
+  php_value error_reporting 'E_ALL & ~E_NOTICE'
+  php_value register_long_arrays Off
+  AddType application/x-httpd-php .php
+  DirectoryIndex index.php
+</Directory>
+


Property changes on: kolab-webclient/trunk/horde-config/apache.conf
___________________________________________________________________
Name: svn:mergeinfo
   +