gunnar: server/kolab-webclient/horde/templates/horde-3.3.6 webclient-config_hooks.php.template, 1.1, 1.2 webclient-config_mime_drivers.php.template, 1.1, 1.2 webclient-config_motd.php.template, 1.1, 1.2 webclient-config_nls.php.template, 1.1, 1.2 webclient-config_prefs.php.template, 1.1, 1.2 webclient-config_registry.php.template, 1.1, 1.2 webclient-kolab-conf.template, 1.1, 1.2
cvs at kolab.org
cvs at kolab.org
Tue Jan 12 23:16:55 CET 2010
Author: gunnar
Update of /kolabrepository/server/kolab-webclient/horde/templates/horde-3.3.6
In directory doto:/tmp/cvs-serv4372/horde-3.3.6
Modified Files:
webclient-config_hooks.php.template
webclient-config_mime_drivers.php.template
webclient-config_motd.php.template
webclient-config_nls.php.template
webclient-config_prefs.php.template
webclient-config_registry.php.template
webclient-kolab-conf.template
Log Message:
Fix templates to use the configuration capability provided with the patch from Mathieu Parent.
Index: webclient-config_hooks.php.template
===================================================================
RCS file: /kolabrepository/server/kolab-webclient/horde/templates/horde-3.3.6/webclient-config_hooks.php.template,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- webclient-config_hooks.php.template 11 Jan 2010 16:38:56 -0000 1.1
+++ webclient-config_hooks.php.template 12 Jan 2010 22:16:53 -0000 1.2
@@ -1,9 +1,13 @@
KOLAB_META_START
-TARGET=@@@horde_confdir@@@/hooks.local.php
+TARGET=@@@horde_confdir@@@/hooks.d/20-kolab_local.php
PERMISSIONS=0400
OWNERSHIP=@@@webserver_usr@@@:@@@webserver_grp@@@
KOLAB_META_END
<?php
+/*
+@@@warning@@@
+*/
+
/* This file can be used to customize your kolab-webclient installation. */
/* Anything you add to this configuration file will override settings */
/* from @@@horde_confdir@@@/hooks.php
Index: webclient-config_mime_drivers.php.template
===================================================================
RCS file: /kolabrepository/server/kolab-webclient/horde/templates/horde-3.3.6/webclient-config_mime_drivers.php.template,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- webclient-config_mime_drivers.php.template 11 Jan 2010 16:38:56 -0000 1.1
+++ webclient-config_mime_drivers.php.template 12 Jan 2010 22:16:53 -0000 1.2
@@ -1,9 +1,13 @@
KOLAB_META_START
-TARGET=@@@horde_confdir@@@/mime_drivers.local.php
+TARGET=@@@horde_confdir@@@/mime_drivers.d/20-kolab_local.php
PERMISSIONS=0400
OWNERSHIP=@@@webserver_usr@@@:@@@webserver_grp@@@
KOLAB_META_END
<?php
+/*
+@@@warning@@@
+*/
+
/* This file can be used to customize your kolab-webclient installation. */
/* Anything you add to this configuration file will override settings */
/* from @@@horde_confdir@@@/mime_drivers.php
Index: webclient-config_motd.php.template
===================================================================
RCS file: /kolabrepository/server/kolab-webclient/horde/templates/horde-3.3.6/webclient-config_motd.php.template,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- webclient-config_motd.php.template 11 Jan 2010 16:38:56 -0000 1.1
+++ webclient-config_motd.php.template 12 Jan 2010 22:16:53 -0000 1.2
@@ -1,9 +1,13 @@
KOLAB_META_START
-TARGET=@@@horde_confdir@@@/motd.local.php
+TARGET=@@@horde_confdir@@@/motd.d/20-kolab_local.php
PERMISSIONS=0400
OWNERSHIP=@@@webserver_usr@@@:@@@webserver_grp@@@
KOLAB_META_END
<?php
+/*
+@@@warning@@@
+*/
+
/* This file can be used to customize your kolab-webclient installation. */
/* Anything you add to this configuration file will override settings */
/* from @@@horde_confdir@@@/motd.php
Index: webclient-config_nls.php.template
===================================================================
RCS file: /kolabrepository/server/kolab-webclient/horde/templates/horde-3.3.6/webclient-config_nls.php.template,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- webclient-config_nls.php.template 11 Jan 2010 16:38:56 -0000 1.1
+++ webclient-config_nls.php.template 12 Jan 2010 22:16:53 -0000 1.2
@@ -1,9 +1,13 @@
KOLAB_META_START
-TARGET=@@@horde_confdir@@@/nls.local.php
+TARGET=@@@horde_confdir@@@/nls.d/20-kolab_local.php
PERMISSIONS=0400
OWNERSHIP=@@@webserver_usr@@@:@@@webserver_grp@@@
KOLAB_META_END
<?php
+/*
+@@@warning@@@
+*/
+
/* This file can be used to customize your kolab-webclient installation. */
/* Anything you add to this configuration file will override settings */
/* from @@@horde_confdir@@@/nls.php
Index: webclient-config_prefs.php.template
===================================================================
RCS file: /kolabrepository/server/kolab-webclient/horde/templates/horde-3.3.6/webclient-config_prefs.php.template,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- webclient-config_prefs.php.template 11 Jan 2010 16:38:56 -0000 1.1
+++ webclient-config_prefs.php.template 12 Jan 2010 22:16:53 -0000 1.2
@@ -1,9 +1,13 @@
KOLAB_META_START
-TARGET=@@@horde_confdir@@@/prefs.local.php
+TARGET=@@@horde_confdir@@@/prefs.d/20-kolab_local.php
PERMISSIONS=0400
OWNERSHIP=@@@webserver_usr@@@:@@@webserver_grp@@@
KOLAB_META_END
<?php
+/*
+@@@warning@@@
+*/
+
/* This file can be used to customize your kolab-webclient installation. */
/* Anything you add to this configuration file will override settings */
/* from @@@horde_confdir@@@/prefs.php
Index: webclient-config_registry.php.template
===================================================================
RCS file: /kolabrepository/server/kolab-webclient/horde/templates/horde-3.3.6/webclient-config_registry.php.template,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- webclient-config_registry.php.template 11 Jan 2010 16:38:56 -0000 1.1
+++ webclient-config_registry.php.template 12 Jan 2010 22:16:53 -0000 1.2
@@ -1,9 +1,13 @@
KOLAB_META_START
-TARGET=@@@horde_confdir@@@/registry.local.php
+TARGET=@@@horde_confdir@@@/registry.d/20-kolab_local.php
PERMISSIONS=0400
OWNERSHIP=@@@webserver_usr@@@:@@@webserver_grp@@@
KOLAB_META_END
<?php
+/*
+@@@warning@@@
+*/
+
/* This file can be used to customize your kolab-webclient installation. */
/* Anything you add to this configuration file will override settings */
/* from @@@horde_confdir@@@/registry.php
Index: webclient-kolab-conf.template
===================================================================
RCS file: /kolabrepository/server/kolab-webclient/horde/templates/horde-3.3.6/webclient-kolab-conf.template,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- webclient-kolab-conf.template 11 Jan 2010 16:38:56 -0000 1.1
+++ webclient-kolab-conf.template 12 Jan 2010 22:16:53 -0000 1.2
@@ -1,9 +1,13 @@
KOLAB_META_START
-TARGET=@@@horde_confdir@@@/kolab.php
+TARGET=@@@horde_confdir@@@/conf.d/20-kolab_local.php
PERMISSIONS=0400
OWNERSHIP=@@@webserver_usr@@@:@@@webserver_grp@@@
KOLAB_META_END
<?php
+/*
+@@@warning@@@
+*/
+
$conf['cookie']['domain'] = '@@@fqdnhostname@@@';
$conf['cookie']['path'] = '@@@horde_cookie_path@@@';
$conf['problems']['email'] = 'postmaster@@@@postfix-mydomain@@@';
More information about the commits
mailing list