Compare commits

...

10 Commits

Author SHA1 Message Date
Daniel Berteaud
3a72fe43dc Automatic commit of package [ipasserelle-groupware] release [0.2.37-1].
Created by command:

/usr/bin/tito tag
2018-03-27 15:40:36 +02:00
Daniel Berteaud
62c72063a3 Configure tito 2018-03-27 15:40:06 +02:00
Daniel Berteaud
f3886a8d31 Initialized to use tito. 2018-03-27 15:39:40 +02:00
Daniel Berteaud
71a13a0f32 Adapt spec file for tito 2018-03-27 15:37:28 +02:00
Daniel Berteaud
d4b8c580c8 Also use / separator when PublicMailbox is enabled 2018-03-27 15:34:45 +02:00
Daniel Berteaud
a92c967750 Spec file update 2017-07-03 11:52:40 +02:00
Daniel Berteaud
1bf49af229 Add optional debug directives 2017-07-03 11:26:27 +02:00
Daniel Berteaud
895af6c23d Spec file update 2017-06-20 17:25:49 +02:00
Daniel Berteaud
78dd537c35 Allow setting number of workers 2017-06-20 17:02:59 +02:00
Daniel Berteaud
3367ad69ac Spec file update 2017-03-23 14:29:07 +01:00
8 changed files with 50 additions and 13 deletions

3
.tito/packages/.readme Normal file
View File

@ -0,0 +1,3 @@
the .tito/packages directory contains metadata files
named after their packages. Each file has the latest tagged
version and the project's relative directory.

View File

@ -0,0 +1 @@
0.2.37-1 ./

1
.tito/releasers.conf Symbolic link
View File

@ -0,0 +1 @@
../../tito_libs/releasers.conf

6
.tito/tito.props Normal file
View File

@ -0,0 +1,6 @@
[buildconfig]
builder = tito.builder.Builder
tagger = tito.tagger.VersionTagger
changelog_do_not_remove_cherrypick = 0
changelog_format = %s (%ae)
lib_dir = ../tito_libs

View File

@ -1,11 +1,8 @@
%define version 0.2.33
%define release 1
%define name ipasserelle-groupware
%define debug_package %{nil}
Name: %{name}
Version: %{version}
Release: %{release}%{?dist}
Name: ipasserelle-groupware
Version: 0.2.37
Release: 1%{?dist}
Epoch: 9
Summary: iPasserelle Groupware module
Group: Networking/Daemons
@ -39,6 +36,18 @@ iPasserelle module for the groupware application.
Based on smeserver-sogo from nethesis
%changelog
* Tue Mar 27 2018 Daniel Berteaud <daniel@firewall-services.com> 0.2.37-1
- new package built with tito
- Use / separator when using only PublicMailbox
* Mon Jul 3 2017 Daniel Berteaud <daniel@firewall-services.com> - 0.2.36-1
- Add Debug prop to turn on all the debug directives in sogo.conf
* Tue Jun 20 2017 Daniel Berteaud <daniel@firewall-services.com> - 0.2.35-1
- Allow setting the number of workers, or the number of users per worker
* Thu Mar 23 2017 Daniel Berteaud <daniel@firewall-services.com> - 0.2.34-1
- Use expire-autoreply for SOGo v2 instead of update-autoreply
* Thu Feb 16 2017 Daniel Berteaud <daniel@firewall-services.com> - 0.2.33-1
- Set a shorter cache TTL when not using CAS authentication

View File

@ -4,7 +4,7 @@
SOGoSMTPServer = localhost;
SOGoIMAPServer = "imap://localhost:{$imap{'TCPPort'} || '143'}";
NGImap4DisableIMAP4Pooling = NO;
NGImap4ConnectionStringSeparator = "{ (($dovecot{SharedMailbox} || 'disabled') eq 'enabled') ? '/' : '.' }";
NGImap4ConnectionStringSeparator = "{ ((($dovecot{SharedMailbox} || 'disabled') eq 'enabled') || (($dovecot{PublicMailbox} || 'disabled') eq 'enabled')) ? '/' : '.' }";
SOGoDraftsFolderName = {($sogod{'DraftsFolder'} || "Drafts")};
SOGoSentFolderName = {($sogod{'SentFolder'} || "Sent")};
SOGoTrashFolderName = {($sogod{'TrashFolder'} || "Trash")};

View File

@ -0,0 +1,11 @@
{
if (($sogod{Debug} || 'disabled') =~ m/^yes|on|enabled|1$/){
$OUT .=<<'_EOF';
SOGoDebugRequests = YES;
SOGoEASDebugEnabled = YES;
ImapDebugEnabled = YES;
LDAPDebugEnabled = YES;
MySQL4DebugEnabled = YES;
_EOF
}
}

View File

@ -1,12 +1,18 @@
{
use esmith::AccountsDB;
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);
use esmith::ConfigDB;
my $fork;
if ($sogod{Workers}){
$fork = $sogod{Workers};
}
else{
my $users_per_worker = (defined $sogod{UsersPerWorker}) ? $sogod{UsersPerWorker} : (($sogod{'ActiveSync'} || 'disabled') =~ m/^enabled|on|1|yes$/i) ? 4 : 7;
my $a = esmith::AccountsDB->open_ro || die "Couldn't open AccountsDB\n";
my $users = scalar($a->users());
$fork = int($users/$users_per_worker);
$fork = 3 if ($fork < 3);
}
$OUT .= "PREFORK=$fork";