[pkg-kolab] r761 - kolabd/branches/2.2/debian/patches/common

[mparent-guest at alioth.debian.org]

Author: mparent-guest
Date: 2008-03-14 20:06:05 +0000 (Fri, 14 Mar 2008)
New Revision: 761

Modified:
   kolabd/branches/2.2/debian/patches/common/dist_conf.dpatch
Log:
Webserver paths like kolab-webadmin


Modified: kolabd/branches/2.2/debian/patches/common/dist_conf.dpatch
===================================================================
--- kolabd/branches/2.2/debian/patches/common/dist_conf.dpatch	2008-03-14 19:38:08 UTC (rev 760)
+++ kolabd/branches/2.2/debian/patches/common/dist_conf.dpatch	2008-03-14 20:06:05 UTC (rev 761)
@@ -5,8 +5,8 @@
 
 @DPATCH@
 diff -urNad kolabd-2.1.99+20080204.dfsg~/dist_conf/debian kolabd-2.1.99+20080204.dfsg/dist_conf/debian
---- kolabd-2.1.99+20080204.dfsg~/dist_conf/debian	2008-02-29 19:33:40.000000000 +0100
-+++ kolabd-2.1.99+20080204.dfsg/dist_conf/debian	2008-02-29 19:34:05.000000000 +0100
+--- kolabd-2.1.99+20080204.dfsg~/dist_conf/debian	2008-03-14 21:02:36.000000000 +0100
++++ kolabd-2.1.99+20080204.dfsg/dist_conf/debian	2008-03-14 21:03:14.000000000 +0100
 @@ -1,14 +1,15 @@
 -kolab_usr=root
 -kolab_grp=root
@@ -109,13 +109,16 @@
 +ldapserver_rusr=openldap
  
 -webserver_document_root=/var/www
-+webserver_document_root=/usr/share
++webserver_document_root=/usr/share/kolab
  webserver_cgidir=${webserver_document_root}/cgi-bin
  webserver_sessions=${localstatedir}/cache/kolab/httpd_sessions
  webserver_logdir=${localstatedir}/log/apache2
-@@ -104,29 +108,41 @@
+@@ -102,31 +106,43 @@
+ webserver_mime_typesfile=${sysconfdir}/apache2/mime.types
+ webserver_sslscache=${sysrundir}/ssl_scache
  webserver_sslmutex=${sysrundir}/ssl_mutex
- webserver_web_prefix=/kolab
+-webserver_web_prefix=/kolab
++webserver_web_prefix=
  webserver_musr=kolab
 -webserver_usr=wwwrun
 -webserver_grp=www