gunnar: server/kolab-webclient .cvsignore, NONE, 1.1 webclient-kolab-conf.template, NONE, 1.1 webclient-kronolith-kolab-conf.template, NONE, 1.1 kolab-webclient.spec, 1.1, 1.2 horde-kolab-conf.template, 1.1, NONE horde-kronolith-kolab-conf.template, 1.1, NONE

[cvs at kolab.org]

Author: gunnar

Update of /kolabrepository/server/kolab-webclient
In directory doto:/tmp/cvs-serv17207

Modified Files:
	kolab-webclient.spec 
Added Files:
	.cvsignore webclient-kolab-conf.template 
	webclient-kronolith-kolab-conf.template 
Removed Files:
	horde-kolab-conf.template horde-kronolith-kolab-conf.template 
Log Message:
This completes the kolab-webclient package to an early draft version.

--- NEW FILE: .cvsignore ---
*.src.rpm

--- NEW FILE: webclient-kolab-conf.template ---
KOLAB_META_START
TARGET=@@@webserver_document_root@@@/client/config/kolab.php
PERMISSIONS=0600
OWNERSHIP=@@@kolab_usr@@@:@@@kolab_grp@@@
KOLAB_META_END
<?php
$conf['cookie']['domain'] = '@@@fqdnhostname@@@';
$conf['cookie']['path'] = '/client';
$conf['problems']['email'] = 'postmaster@@@@postfix-mydomain@@@';
$conf['problems']['maildomain'] = '@@@postfix-mydomain@@@';
$conf['kolab']['ldap']['server'] = '@@@fqdnhostname@@@';
$conf['kolab']['ldap']['basedn'] = '@@@base_dn@@@';
$conf['kolab']['ldap']['phpdn'] = '@@@php_dn@@@';
$conf['kolab']['ldap']['phppw'] = '@@@php_pw@@@';
@@@if cyrus-imap@@@
$conf['kolab']['imap']['server'] = '@@@fqdnhostname@@@';
@@@else@@@
$conf['kolab']['imap']['server'] = '@@@local_addr@@@';
@@@endif@@@
$conf['kolab']['imap']['maildomain'] = '@@@postfix-mydomain@@@';
?>

--- NEW FILE: webclient-kronolith-kolab-conf.template ---
KOLAB_META_START
TARGET=@@@webserver_document_root@@@/client/kronolith/config/kolab.php
PERMISSIONS=0600
OWNERSHIP=@@@kolab_usr@@@:@@@kolab_grp@@@
KOLAB_META_END
<?php
$conf['storage']['default_domain'] = '@@@postfix-mydomain@@@';
$conf['reminder']['server_name'] = '@@@fqdnhostname@@@';
$conf['reminder']['from_addr'] = 'postmaster@@@@postfix-mydomain@@@';
?>

Index: kolab-webclient.spec
===================================================================
RCS file: /kolabrepository/server/kolab-webclient/kolab-webclient.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- kolab-webclient.spec	11 Aug 2008 13:57:04 -0000	1.1
+++ kolab-webclient.spec	18 Aug 2008 08:28:21 -0000	1.2
@@ -24,8 +24,8 @@
 # List of Sources
 Source0:	http://ftp.horde.org/pub/%{V_horde_name}/%{V_horde_name}-%{V_version}.tar.gz
 Source1:        http://ftp.horde.org/pub/passwd/passwd-h3-%{V_passwd_version}.tar.gz
-Source2:        horde-kolab-conf.template
-Source3:        horde-kronolith-kolab-conf.template
+Source2:        webclient-kolab-conf.template
+Source3:        webclient-kronolith-kolab-conf.template
 
 # List of Patches
 Patch0:         http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/horde-webmail/%{V_version}/horde-webmail-%{V_version}_kolab_openpkg.patch
@@ -60,7 +60,6 @@
 
 %install
 
-	%{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/var/apache/log/webclient
 	%{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client
 	%{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/var/kolab/tmp
 	%{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/var/kolab/storage
@@ -74,6 +73,8 @@
 
 	cp -r * $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/
 
+        sqlite $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/storage/horde.db < scripts/sql/groupware.sql
+
 	cd ..
 
 	%{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/client/passwd
@@ -82,9 +83,8 @@
 	  $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/templates	
 
 	%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std} \
-            %dir '%defattr(-,%{l_nusr},%{l_ngrp})' %{l_prefix}/var/apache/log/webclient \
-            %dir '%defattr(-,%{l_nusr},%{l_ngrp})' %{l_prefix}/var/kolab/tmp \
-	    '%config(noreplace) %{l_prefix}/etc/kolab/templates/horde-kolab-conf.template' \
+	    '%config(noreplace) %{l_prefix}/etc/kolab/templates/webclient-kolab-conf.template' \
+	    '%config(noreplace) %{l_prefix}/etc/kolab/templates/webclient-kronolith-kolab-conf.template' \
 	    '%config(noreplace) %{l_prefix}/var/kolab/www/client/config/*.php' \
 	    '%config(noreplace) %{l_prefix}/var/kolab/www/client/dimp/config/*.php' \
 	    '%config(noreplace) %{l_prefix}/var/kolab/www/client/imp/config/*.php' \
@@ -95,7 +95,12 @@
 	    '%config(noreplace) %{l_prefix}/var/kolab/www/client/nag/config/*.php' \
 	    '%config(noreplace) %{l_prefix}/var/kolab/www/client/passwd/config/*.php' \
 	    '%config(noreplace) %{l_prefix}/var/kolab/www/client/turba/config/*.php' \
-	    '%defattr(-,%{l_nusr},%{l_ngrp})' %{l_prefix}/var/kolab/www/client/config/conf.php
+            %dir '%defattr(-,%{l_nusr},%{l_ngrp})' %{l_prefix}/var/kolab/www/client/log \
+            %dir '%defattr(-,%{l_nusr},%{l_ngrp})' %{l_prefix}/var/kolab/www/client/tmp \
+            %dir '%defattr(-,%{l_nusr},%{l_ngrp})' %{l_prefix}/var/kolab/www/client/storage \
+            %dir '%defattr(-,%{l_nusr},%{l_ngrp})' %{l_prefix}/var/kolab/www/client/storage/horde.db \
+	    '%Defattr(-,%{l_nusr},%{l_ngrp})' %{l_prefix}/var/kolab/www/client/config/conf.php \
+	    '%defattr(-,%{l_nusr},%{l_ngrp})' %{l_prefix}/var/kolab/www/client/**/config/conf.php
 
 %clean
 	rm -rf $RPM_BUILD_ROOT

--- horde-kolab-conf.template DELETED ---

--- horde-kronolith-kolab-conf.template DELETED ---