Compare commits
9 Commits
0.2.35_0.f
...
master
Author | SHA1 | Date | |
---|---|---|---|
|
3a72fe43dc | ||
|
62c72063a3 | ||
|
f3886a8d31 | ||
|
71a13a0f32 | ||
|
d4b8c580c8 | ||
|
a92c967750 | ||
|
1bf49af229 | ||
|
895af6c23d | ||
|
78dd537c35 |
3
.tito/packages/.readme
Normal file
3
.tito/packages/.readme
Normal 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.
|
1
.tito/packages/ipasserelle-groupware
Normal file
1
.tito/packages/ipasserelle-groupware
Normal file
|
@ -0,0 +1 @@
|
||||||
|
0.2.37-1 ./
|
1
.tito/releasers.conf
Symbolic link
1
.tito/releasers.conf
Symbolic link
|
@ -0,0 +1 @@
|
||||||
|
../../tito_libs/releasers.conf
|
6
.tito/tito.props
Normal file
6
.tito/tito.props
Normal 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
|
|
@ -1,11 +1,8 @@
|
||||||
%define version 0.2.34
|
|
||||||
%define release 1
|
|
||||||
%define name ipasserelle-groupware
|
|
||||||
%define debug_package %{nil}
|
%define debug_package %{nil}
|
||||||
|
|
||||||
Name: %{name}
|
Name: ipasserelle-groupware
|
||||||
Version: %{version}
|
Version: 0.2.37
|
||||||
Release: %{release}%{?dist}
|
Release: 1%{?dist}
|
||||||
Epoch: 9
|
Epoch: 9
|
||||||
Summary: iPasserelle Groupware module
|
Summary: iPasserelle Groupware module
|
||||||
Group: Networking/Daemons
|
Group: Networking/Daemons
|
||||||
|
@ -39,6 +36,15 @@ iPasserelle module for the groupware application.
|
||||||
Based on smeserver-sogo from nethesis
|
Based on smeserver-sogo from nethesis
|
||||||
|
|
||||||
%changelog
|
%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
|
* Thu Mar 23 2017 Daniel Berteaud <daniel@firewall-services.com> - 0.2.34-1
|
||||||
- Use expire-autoreply for SOGo v2 instead of update-autoreply
|
- Use expire-autoreply for SOGo v2 instead of update-autoreply
|
||||||
|
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
SOGoSMTPServer = localhost;
|
SOGoSMTPServer = localhost;
|
||||||
SOGoIMAPServer = "imap://localhost:{$imap{'TCPPort'} || '143'}";
|
SOGoIMAPServer = "imap://localhost:{$imap{'TCPPort'} || '143'}";
|
||||||
NGImap4DisableIMAP4Pooling = NO;
|
NGImap4DisableIMAP4Pooling = NO;
|
||||||
NGImap4ConnectionStringSeparator = "{ (($dovecot{SharedMailbox} || 'disabled') eq 'enabled') ? '/' : '.' }";
|
NGImap4ConnectionStringSeparator = "{ ((($dovecot{SharedMailbox} || 'disabled') eq 'enabled') || (($dovecot{PublicMailbox} || 'disabled') eq 'enabled')) ? '/' : '.' }";
|
||||||
SOGoDraftsFolderName = {($sogod{'DraftsFolder'} || "Drafts")};
|
SOGoDraftsFolderName = {($sogod{'DraftsFolder'} || "Drafts")};
|
||||||
SOGoSentFolderName = {($sogod{'SentFolder'} || "Sent")};
|
SOGoSentFolderName = {($sogod{'SentFolder'} || "Sent")};
|
||||||
SOGoTrashFolderName = {($sogod{'TrashFolder'} || "Trash")};
|
SOGoTrashFolderName = {($sogod{'TrashFolder'} || "Trash")};
|
||||||
|
|
11
root/etc/e-smith/templates/etc/sogo/sogo.conf/70Verbose
Normal file
11
root/etc/e-smith/templates/etc/sogo/sogo.conf/70Verbose
Normal 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
|
||||||
|
}
|
||||||
|
}
|
|
@ -1,12 +1,18 @@
|
||||||
{
|
{
|
||||||
|
|
||||||
use esmith::AccountsDB;
|
use esmith::AccountsDB;
|
||||||
my $a = esmith::AccountsDB->open_ro || die "Couldn't open AccountsDB\n";
|
use esmith::ConfigDB;
|
||||||
my $users = scalar($a->users());
|
my $fork;
|
||||||
my $fork = int($users/8);
|
if ($sogod{Workers}){
|
||||||
$fork = 3 if ($fork < 3);
|
$fork = $sogod{Workers};
|
||||||
my $activeSync = $sogod{'ActiveSync'} || 'disabled';
|
}
|
||||||
$fork = $fork*2 if ($activeSync =~ m/^enabled|on|1|yes$/i);
|
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";
|
$OUT .= "PREFORK=$fork";
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user