2 commits - pykolab/setup share/templates
Jeroen van Meeuwen
vanmeeuwen at kolabsys.com
Thu Nov 14 21:23:51 CET 2013
pykolab/setup/setup_roundcube.py | 2 +-
share/templates/roundcubemail/kolab.inc.php.tpl | 15 ---------------
share/templates/roundcubemail/libkolab.inc.php.tpl | 16 ++++++++++++++++
3 files changed, 17 insertions(+), 16 deletions(-)
New commits:
commit bdec41105f03e027acf97ebedb40dfe77a043179
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date: Thu Nov 14 21:22:52 2013 +0100
Adjust the filename we want to reflect not renaming the libkolab configuration file
diff --git a/pykolab/setup/setup_roundcube.py b/pykolab/setup/setup_roundcube.py
index 7536ce2..fef4d4a 100644
--- a/pykolab/setup/setup_roundcube.py
+++ b/pykolab/setup/setup_roundcube.py
@@ -94,7 +94,7 @@ def execute(*args, **kw):
'kolab_auth.inc.php',
'kolab_files.inc.php',
'kolab_folders.inc.php',
- 'kolab.inc.php',
+ 'libkolab.inc.php',
'managesieve.inc.php',
'owncloud.inc.php',
'password.inc.php',
commit fd9132936cfccf95b16a8d4e5e6a10798fa7ca0d
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date: Thu Nov 14 21:22:00 2013 +0100
Rename template (#2454)
diff --git a/share/templates/roundcubemail/kolab.inc.php.tpl b/share/templates/roundcubemail/kolab.inc.php.tpl
deleted file mode 100644
index 05711ef..0000000
--- a/share/templates/roundcubemail/kolab.inc.php.tpl
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-
- \$config['kolab_freebusy_server'] = 'http://' . \$_SERVER["HTTP_HOST"] . '/freebusy';
-
- if (file_exists(RCUBE_CONFIG_DIR . '/' . \$_SERVER["HTTP_HOST"] . '/' . basename(__FILE__))) {
- include_once(RCUBE_CONFIG_DIR . '/' . \$_SERVER["HTTP_HOST"] . '/' . basename(__FILE__));
- }
-
- \$config['kolab_cache'] = true;
-
- \$config['kolab_ssl_verify_peer'] = false;
-
- \$config['kolab_use_subscriptions'] = true;
-
-?>
diff --git a/share/templates/roundcubemail/libkolab.inc.php.tpl b/share/templates/roundcubemail/libkolab.inc.php.tpl
new file mode 100644
index 0000000..1e5ff60
--- /dev/null
+++ b/share/templates/roundcubemail/libkolab.inc.php.tpl
@@ -0,0 +1,16 @@
+<?php
+
+ \$config['kolab_freebusy_server'] = 'http://' . \$_SERVER["HTTP_HOST"] . '/freebusy';
+
+ if (file_exists(RCUBE_CONFIG_DIR . '/' . \$_SERVER["HTTP_HOST"] . '/' . basename(__FILE__))) {
+ include_once(RCUBE_CONFIG_DIR . '/' . \$_SERVER["HTTP_HOST"] . '/' . basename(__FILE__));
+ }
+
+ \$config['kolab_cache'] = true;
+
+ \$config['kolab_ssl_verify_host'] = false;
+ \$config['kolab_ssl_verify_peer'] = false;
+
+ \$config['kolab_use_subscriptions'] = true;
+
+?>
More information about the commits
mailing list