From 7e3374af6923cd646e00bba6fcfbeac7885f89d2 Mon Sep 17 00:00:00 2001 From: Daniel Berteaud Date: Sat, 9 Jun 2012 17:08:35 +0200 Subject: [PATCH] Adaptation des templates pour Z-Push 2 --- .../usr/share/sogosync/backend/searchldap/config.php/10Server | 2 +- .../e-smith/templates/usr/share/sogosync/config.php/10TimeZone | 4 +--- .../e-smith/templates/usr/share/sogosync/config.php/20BasePath | 8 ++++++++ .../etc/e-smith/templates/usr/share/sogosync/config.php/30Options | 2 +- root/etc/e-smith/templates/usr/share/sogosync/config.php/35Logs | 7 +++++++ .../etc/e-smith/templates/usr/share/sogosync/config.php/40Backend | 2 +- .../templates/usr/share/sogosync/config.php/45Backend20Imap | 4 ++-- .../usr/share/sogosync/config.php/45Backend50SearchProvider | 4 +++- smeserver-sogosync.spec | 5 ++++- 9 files changed, 28 insertions(+), 10 deletions(-) create mode 100644 root/etc/e-smith/templates/usr/share/sogosync/config.php/35Logs diff --git a/root/etc/e-smith/templates/usr/share/sogosync/backend/searchldap/config.php/10Server b/root/etc/e-smith/templates/usr/share/sogosync/backend/searchldap/config.php/10Server index b69afb9..7ac688e 100644 --- a/root/etc/e-smith/templates/usr/share/sogosync/backend/searchldap/config.php/10Server +++ b/root/etc/e-smith/templates/usr/share/sogosync/backend/searchldap/config.php/10Server @@ -1,4 +1,4 @@ define("LDAP_HOST", "ldap://127.0.0.1/"); -define("LDAP_PORT", "389"); +define("LDAP_PORT", "{$ldap{'TCPPort'} || '389';}"); define("ANONYMOUS_BIND", true); diff --git a/root/etc/e-smith/templates/usr/share/sogosync/config.php/10TimeZone b/root/etc/e-smith/templates/usr/share/sogosync/config.php/10TimeZone index ff62db4..88b16c9 100644 --- a/root/etc/e-smith/templates/usr/share/sogosync/config.php/10TimeZone +++ b/root/etc/e-smith/templates/usr/share/sogosync/config.php/10TimeZone @@ -1,3 +1 @@ - if (function_exists("date_default_timezone_set"))\{ - date_default_timezone_set("{$TimeZone}"); - \} + define('TIMEZONE', '{$TimeZone}'); diff --git a/root/etc/e-smith/templates/usr/share/sogosync/config.php/20BasePath b/root/etc/e-smith/templates/usr/share/sogosync/config.php/20BasePath index ba14e09..e1e873f 100644 --- a/root/etc/e-smith/templates/usr/share/sogosync/config.php/20BasePath +++ b/root/etc/e-smith/templates/usr/share/sogosync/config.php/20BasePath @@ -1,2 +1,10 @@ define('BASE_PATH', dirname($_SERVER['SCRIPT_FILENAME']) . "/"); define('STATE_DIR', '/var/lib/sogosync'); + ini_set('include_path', + BASE_PATH. "include/" . PATH_SEPARATOR . + BASE_PATH. PATH_SEPARATOR . + ini_get('include_path') . PATH_SEPARATOR . + "/usr/share/php/" . PATH_SEPARATOR . + "/usr/share/php5/" . PATH_SEPARATOR . + "/usr/share/pear/" . PATH_SEPARATOR . + "/usr/share/awl/inc"); diff --git a/root/etc/e-smith/templates/usr/share/sogosync/config.php/30Options b/root/etc/e-smith/templates/usr/share/sogosync/config.php/30Options index d8f21e4..78a59ec 100644 --- a/root/etc/e-smith/templates/usr/share/sogosync/config.php/30Options +++ b/root/etc/e-smith/templates/usr/share/sogosync/config.php/30Options @@ -5,4 +5,4 @@ define('SYNC_CONFLICT_DEFAULT', SYNC_CONFLICT_OVERWRITE_PIM); define('SYNC_FILTERTIME_MAX', SYNC_FILTERTYPE_ALL); define('PING_INTERVAL', 30); - + define('SINK_FORCERECHECK', 300); diff --git a/root/etc/e-smith/templates/usr/share/sogosync/config.php/35Logs b/root/etc/e-smith/templates/usr/share/sogosync/config.php/35Logs new file mode 100644 index 0000000..011100a --- /dev/null +++ b/root/etc/e-smith/templates/usr/share/sogosync/config.php/35Logs @@ -0,0 +1,7 @@ + define('LOGFILEDIR', '/var/log/sogosync/'); + define('LOGFILE', LOGFILEDIR . 'sogosync.log'); + define('LOGERRORFILE', LOGFILEDIR . 'error.log'); + define('LOGLEVEL', LOGLEVEL_INFO); + define('LOGAUTHFAIL', false); + define('LOGUSERLEVEL', LOGLEVEL_DEVICEID); + $specialLogUsers = array(); diff --git a/root/etc/e-smith/templates/usr/share/sogosync/config.php/40Backend b/root/etc/e-smith/templates/usr/share/sogosync/config.php/40Backend index e85c7e3..fa46e1c 100644 --- a/root/etc/e-smith/templates/usr/share/sogosync/config.php/40Backend +++ b/root/etc/e-smith/templates/usr/share/sogosync/config.php/40Backend @@ -1 +1 @@ - $BACKEND_PROVIDER = "BackendCombined"; + define('BACKEND_PROVIDER', "BackendCombined"); diff --git a/root/etc/e-smith/templates/usr/share/sogosync/config.php/45Backend20Imap b/root/etc/e-smith/templates/usr/share/sogosync/config.php/45Backend20Imap index bf99ce9..3357c62 100644 --- a/root/etc/e-smith/templates/usr/share/sogosync/config.php/45Backend20Imap +++ b/root/etc/e-smith/templates/usr/share/sogosync/config.php/45Backend20Imap @@ -1,8 +1,8 @@ define('IMAP_SERVER', 'localhost'); - define('IMAP_PORT', {$imap{'TCPPort'}}); + define('IMAP_PORT', {$imap{'TCPPort'} || '143'}); define('IMAP_OPTIONS', '/notls/norsh'); define('IMAP_DEFAULTFROM', ''); - define('IMAP_SENTFOLDER', ''); + define('IMAP_SENTFOLDER', '{$sogod{'SentFolder'} || 'Sent';}'); define('IMAP_INLINE_FORWARD', false); define('IMAP_USE_IMAPMAIL', true); diff --git a/root/etc/e-smith/templates/usr/share/sogosync/config.php/45Backend50SearchProvider b/root/etc/e-smith/templates/usr/share/sogosync/config.php/45Backend50SearchProvider index 0222d65..2854233 100644 --- a/root/etc/e-smith/templates/usr/share/sogosync/config.php/45Backend50SearchProvider +++ b/root/etc/e-smith/templates/usr/share/sogosync/config.php/45Backend50SearchProvider @@ -1 +1,3 @@ - define('SEARCH_PROVIDER', 'SearchLDAP'); + define('SEARCH_PROVIDER', 'BackendSearchLDAP'); + define('SEARCH_WAIT', 10); + define('SEARCH_MAXRESULTS', 80); diff --git a/smeserver-sogosync.spec b/smeserver-sogosync.spec index 0345e98..8eb5cb1 100644 --- a/smeserver-sogosync.spec +++ b/smeserver-sogosync.spec @@ -1,5 +1,5 @@ Name: smeserver-sogosync -Version: 0.1.4 +Version: 0.1.5 Release: 0.beta5%{?dist} Summary: SME Server integration for sogosync @@ -41,6 +41,9 @@ echo "%doc CHANGELOG.git" >> %{name}-%{version}-filelist rm -rf $RPM_BUILD_ROOT %changelog +* Sat Jun 9 2012 Daniel Berteaud 0.1.5-1 +- Config change for Z-Push 2 + * Mon May 14 2012 Daniel Berteaud 0.1.3-1 - Add new caldav param in config.php