On SME8, smeserver-doivecot isn't always installed

Make sure it is before enabling CAS Auth

createlinks

@@ -6,8 +6,7 @@ service_link_enhanced("memcached-sogo", "S55", "7");
 service_link_enhanced("sogod", "S85", "7");
 
 templates2events("/etc/e-smith/sql/init/sogo", qw(email-update bootstrap-console-save));
-templates2events("/etc/cron.d/sogo-alarm", qw(email-update bootstrap-console-save));
-templates2events("/var/lib/sogo/GNUstep/Defaults/.GNUstepDefaults", qw(email-update bootstrap-console-save pre-backup));
+templates2events("/etc/sogo/sogo.conf", qw(email-update bootstrap-console-save pre-backup));
 templates2events("/etc/sysconfig/sogo", qw(email-update bootstrap-console-save));
 templates2events("/etc/logrotate.d/sogo", qw(email-update bootstrap-console-save));
 templates2events("/etc/pam.d/dovecot", qw(email-update bootstrap-console-save));

ipasserelle-groupware.spec

@@ -1,4 +1,4 @@
-%define version 0.2.13
+%define version 0.2.25
 %define release 1
 %define name ipasserelle-groupware
 %define debug_package %{nil}
@@ -12,15 +12,15 @@ License: GPLv3+
 URL: http://www.ipasserelle.com
 Source0: %{name}-%{version}.tar.gz
 
-BuildArch: noarch
-BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 
 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
@@ -37,8 +37,47 @@ Provides: smeserver-sogo
 iPasserelle module for the groupware application.
 Based on smeserver-sogo from nethesis
 
-
 %changelog
+* Wed Feb 18 2015 Daniel Berteaud <daniel@firewall-services.com> - 0.2.25-1
+- Allow EAS push
+
+* Tue Feb 17 2015 Daniel Berteaud <daniel@firewall-services.com> - 0.2.24-1
+- Increase memcached duration to 2 hours
+- Completly disable dovecot's negative cache
+
+* Tue Feb 17 2015 Daniel Berteaud <daniel@firewall-services.com> - 0.2.23-1
+- Fix slow access when logged in from different browsers at the same time
+
+* Wed Jan 21 2015 Daniel Berteaud <daniel@firewall-services.com> - 0.2.22-1
+- Dovecot ttl are in seconds
+
+* Wed Jan 21 2015 Daniel Berteaud <daniel@firewall-services.com> - 0.2.21-1
+- Make dovecot's auth_cache last as long as sogo's memcached
+
+* Wed Jan 7 2015 Daniel Berteaud <daniel@firewall-services.com> - 0.2.20-1
+- Enable dovecot auth_cache
+- Enable IMAP pooling to reduce auth against dovecot
+
+* Thu Sep 11 2014 Daniel Berteaud <daniel@firewall-services.com> - 0.2.19-1
+- Update refresh param for SOGo 2.2.8
+
+* Wed Jun 25 2014 Daniel Berteaud <daniel@firewall-services.com> - 0.2.18-1
+- Use sogo-tool to expire sessions
+
+* Tue Feb 25 2014 Daniel Berteaud <daniel@firewall-services.com> - 0.2.17-1
+- Add optional support for ActiveSync (default is disabled)
+- Add a default reminder 15 minutes before appointments
+- Fix an AliasMatch directive in httpd.conf template
+
+* Fri Dec 20 2013 Daniel Berteaud <daniel@firewall-services.com> - 0.2.16-1
+- Remove EMailAlarm option
+
+* Thu Dec 12 2013 Daniel Berteaud <daniel@firewall-services.com> - 0.2.15-1
+- Template /etc/sogo/sogo.conf instead of /var/lib/sogo/GNUstep/Defaults/.GNUstepDefaults
+
+* Tue Nov 12 2013 Daniel Berteaud <daniel@firewall-services.com> - 0.2.14-1
+- Do not compile for noarch as we now have C code to compile
+
 * Mon Sep 30 2013 Daniel Berteaud <daniel@firewall-services.com> - 0.2.13-1
 - Increase Cache Cleanup interval
 

root/etc/cron.hourly/sogo-sessions

@@ -1,7 +1,6 @@
 #!/bin/bash
 
 TIME=$(/sbin/e-smith/db configuration getprop sogod SessionDuration || echo 1440)
-TIME=$(($TIME*60))
 
 # Remove old SOGo sessions entries
-/usr/bin/mysql sogo -e "delete from sogo_sessions_folder where unix_timestamp(now())-c_lastseen > $TIME;"
+su -l -s /bin/bash sogo -c "/usr/sbin/sogo-tool expire-sessions $TIME"

root/etc/e-smith/db/configuration/defaults/dovecot/PassDBArgs

@@ -0,0 +1 @@
+cache_key=%n%r%l%w

root/etc/e-smith/db/configuration/defaults/sogod/EMailAlarms

@@ -1 +0,0 @@
-no

root/etc/e-smith/db/configuration/migrate/DovecotCacheKeys

@@ -0,0 +1,8 @@
+{
+  # Add the plaintext password to the cache key so concurrent sessions
+  # from SOGo, using different CAS PT can work
+  my $args = $DB->get_prop('dovecot', 'PassDBArgs');
+  if ($args && $args eq 'cache_key=%n%r%l'){
+    $DB->set_prop('dovecot', 'PassDBArgs', 'cache_key=%n%r%l%w');
+  }
+}

root/etc/e-smith/events/actions/sogo-upgrade

@@ -4,3 +4,7 @@
 if [ $? -eq 0 ]; then
     /usr/sbin/usermod -d /var/lib/sogo -m -s /sbin/nologin -c "SOGo daemon" sogo 2>/dev/null
 fi
+
+rm -f /var/lib/sogo/GNUstep/Defaults/.GNUstepDefaults
+
+rm -f /etc/cron.d/sogo-alarm

root/etc/e-smith/locale/fr/etc/e-smith/web/functions/sogo

@@ -23,14 +23,6 @@
         <base>SEND_ACL_MAIL</base>
         <trans>Notification des changements de droit d'accès</trans>
     </entry>
-    <entry>
-        <base>MAIL_ALARM_DESC</base>
-        <trans>Par défaut, SOGo affiche un pop-up pour vous rappeler vos rendez-vous. Si vous activez cette fonction, les utilisateurs pourront également recevoir un mail de rappel</trans>
-    </entry>
-    <entry>
-        <base>MAIL_ALARM</base>
-        <trans>Rappel par mail</trans>
-    </entry>
     <entry>
         <base>AUX_ACCOUNTS_DESC</base>
         <trans>Si cette fonction est activée, les utilisateurs pourront s'abonner à des comptes IMAP externes. Ils pourront ainsi gérer tous leurs comptes emails depuis l'interface web. Souhaitez-vous activer cette fonction ?</trans>

root/etc/e-smith/templates/etc/cron.d/sogo-alarm/10All

@@ -1,7 +0,0 @@
-# SOGo Email Alarms
-{
-if (($sogod{'EMailAlarms'} || 'no') =~ m/^no$/i){
-    $OUT .= "# Email alarms are disabled\n# ";
-}
-$OUT .= "* * * * * sogo /usr/sbin/sogo-ealarms-notify\n";
-}

root/etc/e-smith/templates/etc/dovecot/dovecot.conf/014AuthCache

@@ -0,0 +1,17 @@
+{
+# Only enable auth cache if SOGo is using CAS
+my $sogo_auth = $sogod{'Authentication'} || 'cas';
+if (lc $sogo_auth eq 'cas'){
+  my $size = $dovecot{'AuthCacheSize'} || '5242880';
+  my $ttl = $dovecot{'AuthCacheTTL'} || '7200';
+  my $neg_ttl = $dovecot{'AuthCacheNegativeTTL'} || '0';
+  $OUT .=<<"EOF";
+auth_cache_size = $size
+auth_cache_ttl = $ttl
+auth_cache_negative_ttl = $neg_ttl
+EOF
+}
+else{
+  $OUT .= "# No auth cache as SOGo doesn't use CAS";
+}
+}

root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/85SOGoAccess

@@ -2,7 +2,8 @@
 {
     $sogoStatus = $sogod{'status'} || "disabled";
     $webmailStatus = $imp{'status'} || "disabled";
-    my $lib = ( -d '/usr/lib64/GNUstep/SOGo/WebServerResources' ) ? 'lib64':'lib';
+    $activeSync = $sogod{'ActiveSync'} || 'disabled';
+    $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);
     $style =~ s#$#/# unless ( $style =~ m#/$# );
@@ -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=3600
+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

root/etc/e-smith/templates/etc/pam.d/dovecot/05cas

@@ -1,5 +1,6 @@
 {
-if (-d '/var/service/dovecot'){
+my $auth = $sogod{'Authentication'} || 'cas';
+if (lc $auth eq 'cas' && -d '/var/service/dovecot'){
     $OUT .=<<"HERE";
 auth    sufficient      pam_cas.so -simap://localhost -f/etc/pam_cas.conf
 HERE

root/etc/e-smith/templates/etc/sogo/sogo.conf/10start

@@ -0,0 +1,2 @@
+\{
+

root/etc/e-smith/templates/etc/sogo/sogo.conf/16memcached

@@ -1,2 +1,2 @@
         SOGoMemcachedHost = "/var/run/sogo/memcached.sock";
-        SOGoCacheCleanupInterval = 1800;
+        SOGoCacheCleanupInterval = 7200;

root/etc/e-smith/templates/etc/sogo/sogo.conf/20mail

@@ -3,6 +3,7 @@
         SOGoMailingMechanism = smtp;
         SOGoSMTPServer = localhost;
         SOGoIMAPServer = "imap://localhost:{$imap{'TCPPort'} || '143'}";
+        NGImap4DisableIMAP4Pooling = NO;
         SOGoDraftsFolderName = {($sogod{'DraftsFolder'} || "Drafts")};
         SOGoSentFolderName = {($sogod{'SentFolder'} || "Sent")};
         SOGoTrashFolderName = {($sogod{'TrashFolder'} || "Trash")};

root/etc/e-smith/templates/etc/sogo/sogo.conf/25notifications

@@ -1,4 +1,4 @@
-        SOGoEnableEMailAlarms = {uc($sogod{'EMailAlarms'} || "no")};
+        SOGoEnableEMailAlarms = NO;
         SOGoACLsSendEMailNotifications = {uc($sogod{'ACLsSendEMailNotifications'} || "no")};
         SOGoAppointmentSendEMailNotifications = YES;
         SOGoAppointmentSendEMailReceipts = YES;

root/etc/e-smith/templates/etc/sogo/sogo.conf/30defaultPrefs

@@ -0,0 +1,4 @@
+        SOGoRefreshViewCheck = "every_10_minutes";
+        SOGoFirstDayOfWeek = "1";
+        SOGoFirstWeekOfYear = "First4DayWeek";
+        SOGoCalendarDefaultReminder = "-PT15M";

root/etc/e-smith/templates/etc/sogo/sogo.conf/55authSource

@@ -56,8 +56,8 @@
             \}
         );
 {
-    # is smeserver-dovecot installed ?
-    if (-d '/var/service/dovecot'){
+    my $auth = $sogod{'Authentication'} || 'cas';
+    if (lc $auth eq 'cas' && -d '/var/service/dovecot'){
         $OUT .=<<"HERE";
         SOGoAuthenticationType = cas;
         SOGoCASServiceURL = "https://auth.$DomainName/cas/";

root/etc/e-smith/templates/etc/sogo/sogo.conf/65ActiveSync

@@ -0,0 +1,12 @@
+{
+
+  if (($sogod{'ActiveSync'} || 'disabled') eq 'enabled'){
+    $OUT .=<<'_EOF';
+        SOGoMaximumPingInterval = 3540;
+        SOGoMaximumSyncInterval = 3540;
+        SOGoInternalSyncInterval = 60;
+        WOWatchDogRequestTimeout = 3600;
+_EOF
+  }
+
+}

root/etc/e-smith/templates/etc/sogo/sogo.conf/99end

@@ -0,0 +1 @@
+\}

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";
 

root/etc/e-smith/templates/var/lib/sogo/GNUstep/Defaults/.GNUstepDefaults/10start

@@ -1,5 +0,0 @@
-\{
-    NSGlobalDomain = \{
-    \};
-    sogod = \{
-

root/etc/e-smith/templates/var/lib/sogo/GNUstep/Defaults/.GNUstepDefaults/30defaultPrefs

@@ -1,3 +0,0 @@
-        SOGoMailMessageCheck = "every_10_minutes";
-        SOGoFirstDayOfWeek = "1";
-        SOGoFirstWeekOfYear = "First4DayWeek";

root/etc/e-smith/templates/var/lib/sogo/GNUstep/Defaults/.GNUstepDefaults/99end

@@ -1,2 +0,0 @@
-    \};
-\}

root/etc/e-smith/web/functions/sogo

@@ -47,12 +47,6 @@ __DATA__
             <description>SEND_ACL_MAIL_DESC</description>
             <label>SEND_ACL_MAIL</label>
         </field>
-        <field type="select" id="mailAlarm" options="'yes' =>
-            'YES', 'no' => 'NO'"
-            value="get_prop('EMailAlarms')">
-            <description>MAIL_ALARM_DESC</description>
-            <label>MAIL_ALARM</label>
-        </field>
         <field type="select" id="auxAccounts" options="'yes' =>
             'YES', 'no' => 'NO'"
             value="get_prop('AuxiliaryUserAccounts')">

root/usr/lib/perl5/site_perl/esmith/FormMagick/Panel/sogo.pm

@@ -107,7 +107,6 @@ sub apply {
 
     $configdb->set_prop('sogod', 'status', $q->param("status"));
     $configdb->set_prop('sogod', 'ACLsSendEMailNotifications', $q->param("aclSendMail"));
-    $configdb->set_prop('sogod', 'EMailAlarms', $q->param("mailAlarm"));
     $configdb->set_prop('sogod', 'AuxiliaryUserAccounts', $q->param("auxAccounts"));
     $configdb->set_prop('sogod', 'PublicAccess', $q->param("publicAccess"));
     $configdb->set_prop('sogod', 'AllowedGroups', join(',', $q->param("allowedGroups")));

root/var/lib/sogo/GNUstep/Library/SOGo/Templates/MainUI/SOGoRootPage.wox

@@ -33,7 +33,7 @@
       <table width="560">
         <tr>
           <td>
-            <img const:alt="*" id="splash" rsrc:src="/logo_ipasserelle.png"/>
+            <img const:alt="*" id="splash" rsrc:src="logo_ipasserelle.png"/>
           </td>
           <td id="loginCell" width="230">
             <label><var:string label:value="Username:"/><br/>
@@ -46,7 +46,6 @@
             <var:popup const:id="language" const:name="language"
                        list="languages"
                        item="item"
-                       var:selection="item"
                        var:value="item"
                        string="languageText"
                        label:noSelectionString="choose"