Compare commits
23 Commits
0.2.29_el6
...
master
Author | SHA1 | Date | |
---|---|---|---|
|
3a72fe43dc | ||
|
62c72063a3 | ||
|
f3886a8d31 | ||
|
71a13a0f32 | ||
|
d4b8c580c8 | ||
|
a92c967750 | ||
|
1bf49af229 | ||
|
895af6c23d | ||
|
78dd537c35 | ||
|
3367ad69ac | ||
|
2dc55fdd13 | ||
|
1ed7ed509a | ||
|
d3d85fae71 | ||
|
90d3c32e99 | ||
|
0e49554d1d | ||
|
2079b392f8 | ||
|
fcc5bf15a3 | ||
|
987e0e06b4 | ||
|
3cb2b15e1c | ||
|
342ecc8603 | ||
|
d2a1a9ea7c | ||
|
6a16066b0e | ||
|
87f6353679 |
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
|
|
@ -10,6 +10,9 @@ templates2events("/etc/sogo/sogo.conf", qw(email-update bootstrap-console-save p
|
|||
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));
|
||||
templates2events("/etc/sogo/sieve.creds", qw(email-update bootstrap-console-save));
|
||||
templates2events("/etc/cron.d/sogo", qw(email-update bootstrap-console-save));
|
||||
templates2events("/etc/dovecot/master.sieve.127.0.0.1", qw(email-update bootstrap-console-save));
|
||||
|
||||
safe_symlink("restart", "root/etc/e-smith/events/email-update/services2adjust/sogod");
|
||||
safe_symlink("restart", "root/etc/e-smith/events/email-update/services2adjust/memcached-sogo");
|
||||
|
|
|
@ -1,11 +1,8 @@
|
|||
%define version 0.2.28
|
||||
%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,35 @@ 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
|
||||
|
||||
* Mon Jan 9 2017 Daniel Berteaud <daniel@firewall-services.com> - 0.2.32-1
|
||||
- Support vacation schedule using a sieve master user
|
||||
- Set junk folder to junkmail
|
||||
- Remove custom login page template
|
||||
|
||||
* Fri Jun 24 2016 Daniel Berteaud <daniel@firewall-services.com> - 0.2.31-1
|
||||
- Use / as mailbox separator when shared mailbox is enabled
|
||||
|
||||
* Wed Jun 8 2016 Daniel Berteaud <daniel@firewall-services.com> - 0.2.30-1
|
||||
- Possibility to set sogo per worker memory limit
|
||||
|
||||
* Mon Jun 6 2016 Daniel Berteaud <daniel@firewall-services.com> - 0.2.29-1
|
||||
- Set . as mailbox separator
|
||||
|
||||
* Wed Jun 3 2015 Daniel Berteaud <daniel@firewall-services.com> - 0.2.28-1
|
||||
- Upgrade DB schema for 2.3.0
|
||||
|
||||
|
|
|
@ -1,6 +0,0 @@
|
|||
#!/bin/bash
|
||||
|
||||
TIME=$(/sbin/e-smith/db configuration getprop sogod SessionDuration || echo 1440)
|
||||
|
||||
# Remove old SOGo sessions entries
|
||||
su -l -s /bin/bash sogo -c "/usr/sbin/sogo-tool expire-sessions $TIME"
|
|
@ -0,0 +1 @@
|
|||
junkmail
|
32
root/etc/e-smith/db/configuration/migrate/SOGoSievePassword
Normal file
32
root/etc/e-smith/db/configuration/migrate/SOGoSievePassword
Normal file
|
@ -0,0 +1,32 @@
|
|||
{
|
||||
my $sogodrec = $DB->get('sogod')
|
||||
|| $DB->new_record('sogod', {type => 'service'});
|
||||
my $sogod_sieve_pw = $sogodrec->prop('SieveMasterPassword');
|
||||
if (not $sogod_sieve_pw or length($sogod_sieve_pw) < 57)
|
||||
{
|
||||
use MIME::Base64 qw(encode_base64);
|
||||
|
||||
$sogod_sieve_pw = "not set due to error";
|
||||
if ( open( RANDOM, "/dev/urandom" ) )
|
||||
{
|
||||
my $buf;
|
||||
# 57 bytes is a full line of Base64 coding, and contains
|
||||
# 456 bits of randomness - given a perfectly random /dev/random
|
||||
if ( read( RANDOM, $buf, 57 ) != 57 )
|
||||
{
|
||||
warn("Short read from /dev/random: $!");
|
||||
}
|
||||
else
|
||||
{
|
||||
$sogod_sieve_pw = encode_base64($buf);
|
||||
chomp $sogod_sieve_pw;
|
||||
}
|
||||
close RANDOM;
|
||||
}
|
||||
else
|
||||
{
|
||||
warn "Could not open /dev/urandom: $!";
|
||||
}
|
||||
$sogodrec->set_prop('SieveMasterPassword', $sogod_sieve_pw);
|
||||
}
|
||||
}
|
|
@ -0,0 +1,2 @@
|
|||
PERMS=0640
|
||||
GID="dovecot"
|
3
root/etc/e-smith/templates.metadata/etc/sogo/sieve.creds
Normal file
3
root/etc/e-smith/templates.metadata/etc/sogo/sieve.creds
Normal file
|
@ -0,0 +1,3 @@
|
|||
PERMS=0640
|
||||
UID="root"
|
||||
GID="sogo"
|
5
root/etc/e-smith/templates/etc/cron.d/sogo/autoreply
Normal file
5
root/etc/e-smith/templates/etc/cron.d/sogo/autoreply
Normal file
|
@ -0,0 +1,5 @@
|
|||
{
|
||||
my $version = qx(/bin/rpm -q --qf "%{version}" sogo-tool);
|
||||
my $cmd = ($version =~ m/^2/) ? 'expire-autoreply' : 'update-autoreply';
|
||||
$OUT = "0 0 * * * sogo /usr/sbin/sogo-tool $cmd -p /etc/sogo/sieve.creds";
|
||||
}
|
1
root/etc/e-smith/templates/etc/cron.d/sogo/sessions
Normal file
1
root/etc/e-smith/templates/etc/cron.d/sogo/sessions
Normal file
|
@ -0,0 +1 @@
|
|||
* * * * * sogo /usr/sbin/sogo-tool expire-sessions { $sogod{SessionDuration} || '60' }
|
|
@ -0,0 +1,9 @@
|
|||
passdb \{
|
||||
driver = passwd-file
|
||||
master = yes
|
||||
args = username_format=%u /etc/dovecot/master.%s.%r
|
||||
\}
|
||||
userdb \{
|
||||
driver = passwd-file
|
||||
args = username_format=%u /etc/dovecot/master.%s.%r
|
||||
\}
|
|
@ -0,0 +1 @@
|
|||
sogo-sieve:\{plain\}{ $sogod{SieveMasterPassword} }:101:101::/home/e-smith::allow_nets=127.0.0.1/8
|
1
root/etc/e-smith/templates/etc/sogo/sieve.creds/sogo
Normal file
1
root/etc/e-smith/templates/etc/sogo/sieve.creds/sogo
Normal file
|
@ -0,0 +1 @@
|
|||
sogo-sieve:{ $sogod{SieveMasterPassword} }
|
|
@ -1,2 +1,2 @@
|
|||
SOGoMemcachedHost = "/var/run/sogo/memcached.sock";
|
||||
SOGoCacheCleanupInterval = 7200;
|
||||
SOGoCacheCleanupInterval = { $sogod{CacheCleanupInterval} || ($sogod{Authentication} || 'cas') ne 'internal' ? '7200' : '300' };
|
||||
|
|
5
root/etc/e-smith/templates/etc/sogo/sogo.conf/18Memory
Normal file
5
root/etc/e-smith/templates/etc/sogo/sogo.conf/18Memory
Normal file
|
@ -0,0 +1,5 @@
|
|||
{
|
||||
my $mem = $sogod{MemoryLimit};
|
||||
return unless $mem;
|
||||
$OUT .= " SxVMemLimit = $mem;\n";
|
||||
}
|
|
@ -4,10 +4,11 @@
|
|||
SOGoSMTPServer = localhost;
|
||||
SOGoIMAPServer = "imap://localhost:{$imap{'TCPPort'} || '143'}";
|
||||
NGImap4DisableIMAP4Pooling = NO;
|
||||
NGImap4ConnectionStringSeparator = ".";
|
||||
NGImap4ConnectionStringSeparator = "{ ((($dovecot{SharedMailbox} || 'disabled') eq 'enabled') || (($dovecot{PublicMailbox} || 'disabled') eq 'enabled')) ? '/' : '.' }";
|
||||
SOGoDraftsFolderName = {($sogod{'DraftsFolder'} || "Drafts")};
|
||||
SOGoSentFolderName = {($sogod{'SentFolder'} || "Sent")};
|
||||
SOGoTrashFolderName = {($sogod{'TrashFolder'} || "Trash")};
|
||||
SOGoJunkFolderName = {($sogod{'JunkFolder'} || "Junk")};
|
||||
SOGoMailListViewColumnsOrder = (
|
||||
Flagged, Attachment, Subject, From, Unread, Date, Size
|
||||
);
|
||||
|
|
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;
|
||||
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";
|
||||
|
||||
|
|
|
@ -1,77 +0,0 @@
|
|||
<?xml version="1.0" standalone="yes"?>
|
||||
<!DOCTYPE var:component>
|
||||
<var:component
|
||||
className="UIxPageFrame"
|
||||
xmlns="http://www.w3.org/1999/xhtml"
|
||||
xmlns:var="http://www.skyrix.com/od/binding"
|
||||
xmlns:const="http://www.skyrix.com/od/constant"
|
||||
xmlns:rsrc="OGo:url"
|
||||
xmlns:label="OGo:label"
|
||||
const:jsFiles="PasswordPolicy.js"
|
||||
const:popup="YES"
|
||||
><var:string var:value="doctype" const:escapeHTML="NO"/>
|
||||
<div id="aboutBox" style="display:none;">
|
||||
<div>
|
||||
<p class="logo"><img const:alt="SOGo" rsrc:src="sogo-logo.png"/></p>
|
||||
<p>Version <var:string value="version"/> <span class="buildDate">(<var:string value="buildDate" />)</span></p>
|
||||
<p class="scroll"><var:string label:value="AboutBox" const:escapeHTML="NO"/></p>
|
||||
<img const:alt="Inverse" rsrc:src="inverse.png"/>
|
||||
<p class="links"><a href="http://www.sogo.nu/" target="_new">www.sogo.nu</a> /
|
||||
<a href="http://www.inverse.ca/" target="_new">www.inverse.ca</a></p>
|
||||
<p><a id="aboutClose" href="#" class="button">
|
||||
<span><var:string label:value="OK" /></span></a></p>
|
||||
</div>
|
||||
</div>
|
||||
<div id="linkBanner" class="linkbanner">
|
||||
<a id="about" href="#"><var:string label:value="About" /></a>
|
||||
</div>
|
||||
<form id="connectForm" var:href="connectURL">
|
||||
<div id="loginScreen">
|
||||
<var:if condition="hasLoginSuffix"><script
|
||||
type="text/javascript">var loginSuffix = '<var:string value="loginSuffix"/>';</script
|
||||
></var:if>
|
||||
<table width="560">
|
||||
<tr>
|
||||
<td>
|
||||
<img const:alt="*" id="splash" rsrc:src="logo_ipasserelle.png"/>
|
||||
</td>
|
||||
<td id="loginCell" width="230">
|
||||
<label><var:string label:value="Username:"/><br/>
|
||||
<input class="textField" id="userName" name="userName"
|
||||
type="text" var:value="cookieUsername" /></label>
|
||||
<label><var:string label:value="Password:"/><br/>
|
||||
<input class="textField" id="password"
|
||||
name="password" type="password" var:value="password" /></label>
|
||||
<label><var:string label:value="Language:"/><br/>
|
||||
<var:popup const:id="language" const:name="language"
|
||||
list="languages"
|
||||
item="item"
|
||||
var:value="item"
|
||||
string="languageText"
|
||||
label:noSelectionString="choose"
|
||||
/></label>
|
||||
<var:if condition="hasLoginDomains">
|
||||
<label><var:string label:value="Domain:"/><br/>
|
||||
<var:popup const:id="domain" const:name="domain"
|
||||
list="loginDomains"
|
||||
item="item"
|
||||
var:selection="item"
|
||||
var:value="item"
|
||||
string="item"
|
||||
/></label>
|
||||
</var:if>
|
||||
<label><input id="rememberLogin" type="checkbox" class="checkBox" var:checked="rememberLogin"/> <var:string label:value="Remember username"/></label>
|
||||
<label>
|
||||
<a href="#" class="button" id="submit" name="submit">
|
||||
<span><var:string label:value="Connect" /></span></a>
|
||||
</label>
|
||||
</td>
|
||||
</tr>
|
||||
<tr><td colspan="2"><label id="animation"><!-- busy.gif! --></label></td></tr>
|
||||
</table>
|
||||
<p id="errorMessage"><!-- space --></p>
|
||||
</div>
|
||||
</form
|
||||
><img const:alt="*" id="preparedAnimation" rsrc:src="busy.gif"/>
|
||||
</var:component>
|
||||
|
Loading…
Reference in New Issue
Block a user