smeserver-zarafa/contribs7/smeserver-zarafa-0.9.0-userprop1.patch

--- smeserver-zarafa-0.9.0/root/etc/e-smith/templates-user/.qmail/80Zarafa.userprop     2008-12-20 17:27:42.000000000 +1100
+++ smeserver-zarafa-0.9.0/root/etc/e-smith/templates-user/.qmail/80Zarafa      2008-12-20 17:28:21.000000000 +1100
@@ -1,5 +1,5 @@
 {
-   my $zarafa = $user->prop('zarafa') || 'disabled';
+   my $zarafa = $user->prop('zarafa') || 'enabled';
    return "| /usr/bin/zarafa-dagent -q $USERNAME ; if [ $? -ne 0 ] ; then exit -1; else exit 99; fi;"
            if ($zarafa eq 'enabled');
 }
--- smeserver-zarafa-0.9.0/root/etc/e-smith/templates-user/.qmail-junkmail/00DeliverToZarafa.userprop   2008-12-20 17:46:53.000000000 +1100
+++ smeserver-zarafa-0.9.0/root/etc/e-smith/templates-user/.qmail-junkmail/00DeliverToZarafa    2008-12-20 17:40:19.000000000 +1100
@@ -0,0 +1,6 @@
+{
+   my $zarafa = $user->prop('zarafa') || 'enabled';
+   return "| /usr/bin/zarafa-dagent -qj $USERNAME ; if [ $? -ne 0 ] ; then exit -1; else exit 99; fi;"
+           if ($zarafa eq 'enabled');
+}
+
--- smeserver-zarafa-0.9.0/root/etc/e-smith/templates/etc/zarafa/server.cfg/server.cfg.userprop 2008-12-20 17:51:40.000000000 +1100
+++ smeserver-zarafa-0.9.0/root/etc/e-smith/templates/etc/zarafa/server.cfg/server.cfg  2008-12-20 17:54:03.000000000 +1100
@@ -10,7 +10,7 @@
 server_tcp_enabled     = yes
 
 # Port to bind to
-server_tcp_port   = { ${'zarafa-server'}{TCPPort} || '236'; }
+server_tcp_port   = { ${'zarafa-server'}{tcpport} || '236'; }
 
 # Accept unix pipe connections (not recommended to disable)
 server_pipe_enabled    = yes
@@ -182,7 +182,7 @@
 { 
   if (( ${'zarafa-server'}{Plugin} || 'db' ) eq 'unix')
   { 'user_plugin_config        = /etc/zarafa/unix.cfg'; }
-  else
+  elsif (( ${'zarafa-server'}{Plugin} || 'db' ) eq 'ldap')
   { 'user_plugin_config        = /etc/zarafa/ldap.cfg'; }
 } 
 
1	--- smeserver-zarafa-0.9.0/root/etc/e-smith/templates-user/.qmail/80Zarafa.userprop 2008-12-20 17:27:42.000000000 +1100
2	+++ smeserver-zarafa-0.9.0/root/etc/e-smith/templates-user/.qmail/80Zarafa 2008-12-20 17:28:21.000000000 +1100
3	@@ -1,5 +1,5 @@
4	{
5	- my $zarafa = $user->prop('zarafa') \|\| 'disabled';
6	+ my $zarafa = $user->prop('zarafa') \|\| 'enabled';
7	return "\| /usr/bin/zarafa-dagent -q $USERNAME ; if [ $? -ne 0 ] ; then exit -1; else exit 99; fi;"
8	if ($zarafa eq 'enabled');
9	}
10	--- smeserver-zarafa-0.9.0/root/etc/e-smith/templates-user/.qmail-junkmail/00DeliverToZarafa.userprop 2008-12-20 17:46:53.000000000 +1100
11	+++ smeserver-zarafa-0.9.0/root/etc/e-smith/templates-user/.qmail-junkmail/00DeliverToZarafa 2008-12-20 17:40:19.000000000 +1100
12	@@ -0,0 +1,6 @@
13	+{
14	+ my $zarafa = $user->prop('zarafa') \|\| 'enabled';
15	+ return "\| /usr/bin/zarafa-dagent -qj $USERNAME ; if [ $? -ne 0 ] ; then exit -1; else exit 99; fi;"
16	+ if ($zarafa eq 'enabled');
17	+}
18	+
19	--- smeserver-zarafa-0.9.0/root/etc/e-smith/templates/etc/zarafa/server.cfg/server.cfg.userprop 2008-12-20 17:51:40.000000000 +1100
20	+++ smeserver-zarafa-0.9.0/root/etc/e-smith/templates/etc/zarafa/server.cfg/server.cfg 2008-12-20 17:54:03.000000000 +1100
21	@@ -10,7 +10,7 @@
22	server_tcp_enabled = yes
23
24	# Port to bind to
25	-server_tcp_port = { ${'zarafa-server'}{TCPPort} \|\| '236'; }
26	+server_tcp_port = { ${'zarafa-server'}{tcpport} \|\| '236'; }
27
28	# Accept unix pipe connections (not recommended to disable)
29	server_pipe_enabled = yes
30	@@ -182,7 +182,7 @@
31	{
32	if (( ${'zarafa-server'}{Plugin} \|\| 'db' ) eq 'unix')
33	{ 'user_plugin_config = /etc/zarafa/unix.cfg'; }
34	- else
35	+ elsif (( ${'zarafa-server'}{Plugin} \|\| 'db' ) eq 'ldap')
36	{ 'user_plugin_config = /etc/zarafa/ldap.cfg'; }
37	}
38