diff --git a/ipasserelle-groupware.spec b/ipasserelle-groupware.spec index 4be701f..d8aeedc 100644 --- a/ipasserelle-groupware.spec +++ b/ipasserelle-groupware.spec @@ -19,8 +19,9 @@ BuildRequires: e-smith-devtools BuildRequires: gcc Requires: smeserver-release >= 8 Requires: e-smith-ldap >= 5.2.0-19 -Requires: sogo >= 2.0.4b +Requires: sogo >= 2.2.0 Requires: sogo-tool +Requires: sogo-activesync Requires: sope49-gdl1-mysql Requires: sogo-ealarms-notify Requires: ipasserelle-base diff --git a/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/85SOGoAccess b/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/85SOGoAccess index 22c78ce..ca1db9c 100644 --- a/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/85SOGoAccess +++ b/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/85SOGoAccess @@ -2,6 +2,7 @@ { $sogoStatus = $sogod{'status'} || "disabled"; $webmailStatus = $imp{'status'} || "disabled"; + $activeSync = $sogod{'ActiveSync'} || 'disabled'; my $lib = ( -d '/usr/lib64/GNUstep/SOGo/WebServerResources' ) ? 'lib64':'lib'; $style = $sogod{'WebServerResources'} || '/usr/' . $lib . '/GNUstep/SOGo/WebServerResources/'; $style = '/usr/' . $lib . '/GNUstep/SOGo/WebServerResources/' unless ( -d $style); @@ -20,6 +21,17 @@ ScriptAlias /sogo-cgi-bin /usr/share/SOGo/cgi-bin ProxyPass /SOGo/casProxy http://localhost/sogo-cgi-bin/cas-proxy-validate +{ +if ($activeSync =~ m/^enabled|on|1|yes$/i){ + $OUT .=<<"HERE"; +ProxyPass /Microsoft-Server-ActiveSync http://127.0.0.1:$sogod{'TCPPort'}/SOGo/Microsoft-Server-ActiveSync retry=60 connectiontimeout=5 timeout=360 +HERE +} +else { + $OUT .= "# ActiveSync is disabled\n"; +} +} + ProxyPass /SOGo http://127.0.0.1:{$sogod{'TCPPort'}}/SOGo ProxyPassReverse /SOGo http://127.0.0.1:{$sogod{'TCPPort'}}/SOGo SetEnvIf Host (.*) REQUEST_HOST=$1 diff --git a/root/etc/e-smith/templates/etc/sysconfig/sogo/Prefork b/root/etc/e-smith/templates/etc/sysconfig/sogo/Prefork index a174678..ae2bba5 100644 --- a/root/etc/e-smith/templates/etc/sysconfig/sogo/Prefork +++ b/root/etc/e-smith/templates/etc/sysconfig/sogo/Prefork @@ -5,6 +5,8 @@ my $a = esmith::AccountsDB->open_ro || die "Couldn't open AccountsDB\n"; my $users = scalar($a->users()); my $fork = int($users/8); $fork = 3 if ($fork < 3); +my $activeSync = $sogod{'ActiveSync'} || 'disabled'; +$fork = $fork*2 if ($activeSync =~ m/^enabled|on|1|yes$/i); $OUT .= "PREFORK=$fork";