Commit 9d249cc7 authored by sikeda's avatar sikeda
Browse files

[svn] Retrieving recent modifications from sympa-6.1-branch (#2 / 5).


git-svn-id: https://subversion.renater.fr/sympa/branches/sympa-6.2-branch@10131 05aa8bb8-cd2b-0410-b1d7-8918dfa770ce
parent e54e0727
......@@ -391,35 +391,64 @@ AC_SUBST(GROUP)
SENDMAIL_ALIASES=/etc/mail/sympa_aliases
AC_ARG_WITH(
[sendmail_aliases],
[aliases_file],
AS_HELP_STRING(
[--with-sendmail_aliases=ALIASFILE],
[--with-aliases_file=ALIASFILE],
[aliases file to store Sympa mail aliases @<:@/etc/mail/sympa_aliases@:>@]
),
[SENDMAIL_ALIASES="$withval"]
)
AC_SUBST(SENDMAIL_ALIASES)
## The postfix virtual file we use. Better use a seperate one for sympa.
## Of course an extra alias file must be generated with proper permissions
## (owner sympa, write access for sympa, no write access for anyone else)
## and declared in main.cf!
VIRTUAL_ALIASES=/etc/mail/sympa_virtual
AC_ARG_WITH(
[virtual_aliases],
[sendmail_aliases], ,
AC_MSG_ERROR([--with-sendmail_aliases was deprecated. Use --with-aliases_file.])
)
VIRTUAL_ALIASES=
AC_ARG_WITH(
[virtual_aliases], ,
AC_MSG_ERROR([--with-virtual_aliases was deprecated. Use --with-aliases_file.])
)
AC_SUBST(VIRTUAL_ALIASES)
MAKEMAP=
AC_ARG_WITH(
[makemap],
AS_HELP_STRING(
[--with-virtual_aliases=ALIASFILE],
[postfix virtual file to be used by Sympa @<:@/etc/mail/sympa_virtual@:>@]
[--with-makemap=FULLPATH],
[path to Sendmail makemap command @<:@AUTO-DETECT@:>@]
),
[VIRTUAL_ALIASES="$withval"]
[MAKEMAP="$withval"]
)
AC_SUBST(VIRTUAL_ALIASES)
if test -n "$MAKEMAP"; then
# user-supplied value
AC_MSG_CHECKING([user-supplied makemap command])
if test -f "$MAKEMAP"; then
:
else
AC_MSG_RESULT([non-existing])
AC_MSG_ERROR([invalid value $MAKEMAP for makemap command])
fi
if test -x "$MAKEMAP"; then
:
else
AC_MSG_RESULT([non-executable])
AC_MSG_ERROR([invalid value $MAKEMAP for makemap command])
fi
AC_MSG_RESULT([$MAKEMAP])
else
# default value
AC_PATH_PROG([MAKEMAP], [makemap], [/usr/bin/makemap])
fi
AC_SUBST(MAKEMAP)
NEWALIASES=
AC_ARG_WITH(
[newaliases],
AS_HELP_STRING(
[--with-newaliases=FULLPATH],
[path to newaliases command @<:@/usr/bin/newaliases@:>@]
[path to newaliases command @<:@AUTO-DETECT@:>@]
),
[NEWALIASES="$withval"]
)
......@@ -441,10 +470,11 @@ if test -n "$NEWALIASES"; then
AC_MSG_RESULT([$NEWALIASES])
else
# default value
NEWALIASES=/usr/bin/newaliases
AC_PATH_PROG([NEWALIASES], [newaliases], [/usr/bin/newaliases])
fi
AC_SUBST(NEWALIASES)
AC_MSG_CHECKING([argument to newaliases command])
NEWALIASES_ARG=
AC_ARG_WITH(
[newaliases_arg],
......@@ -455,12 +485,49 @@ AC_ARG_WITH(
[NEWALIASES_ARG="$withval"]
)
AC_SUBST(NEWALIASES_ARG)
if test -z "$NEWALIASES_ARG"; then
AC_MSG_RESULT([none])
else
AC_MSG_RESULT([$NEWALIASES_ARG])
fi
POSTALIAS=
AC_ARG_WITH(
[postalias],
AS_HELP_STRING(
[--with-postalias=FULLPATH],
[path to Postfix postalias command @<:@AUTO-DETECT@:>@]
),
[POSTALIAS="$withval"]
)
if test -n "$POSTALIAS"; then
# user-supplied value
AC_MSG_CHECKING([user-supplied postalias command])
if test -f "$POSTALIAS"; then
:
else
AC_MSG_RESULT([non-existing])
AC_MSG_ERROR([invalid value $POSTALIAS for postalias command])
fi
if test -x "$POSTALIAS"; then
:
else
AC_MSG_RESULT([non-executable])
AC_MSG_ERROR([invalid value $POSTALIAS for postalias command])
fi
AC_MSG_RESULT([$POSTALIAS])
else
# default value
AC_PATH_PROG([POSTALIAS], [postalias], [/usr/sbin/postalias])
fi
AC_SUBST(POSTALIAS)
POSTMAP=
AC_ARG_WITH(
[postmap],
AS_HELP_STRING(
[--with-postmap=FULLPATH],
[path to postfix postmap command @<:@/usr/sbin/postmap@:>@]
[path to Postfix postmap command @<:@AUTO-DETECT@:>@]
),
[POSTMAP="$withval"]
)
......@@ -482,18 +549,14 @@ if test -n "$POSTMAP"; then
AC_MSG_RESULT([$POSTMAP])
else
# default value
POSTMAP=/usr/sbin/postmap
AC_PATH_PROG([POSTMAP], [postmap], [/usr/sbin/postmap])
fi
AC_SUBST(POSTMAP)
POSTMAP_ARG=${VIRTUAL_ALIASES}
POSTMAP_ARG=
AC_ARG_WITH(
[postmap_arg],
AS_HELP_STRING(
[--with-postmap_arg=ARGS],
[set arguments to postfix postmap command @<:@VIRTUAL_ALIASES@:>@]
),
[POSTMAP_ARG="$withval"]
[postmap_arg], ,
AC_MSG_ERROR([--with-postmap_arg was deprecated. Use --with-newaliases_arg.])
)
AC_SUBST(POSTMAP_ARG)
......
......@@ -22,33 +22,31 @@ SUBDIRS = etc lib
AM_CPPFLAGS = -DCONFIG=\"$(CONFIG)\"
sbin_SCRIPTS = sympa.pl bulk.pl alias_manager.pl task_manager.pl sympa_wizard.pl
sbin_PROGRAMS = aliaswrapper virtualwrapper
aliaswrapper_SOURCES = aliaswrapper.c
aliaswrapper_CPPFLAGS = $(AM_CPPFLAGS) \
-DNEWALIASES=\"${NEWALIASES}\" \
-DNEWALIASES_ARG=\"${NEWALIASES_ARG}\"
virtualwrapper_SOURCES = virtualwrapper.c
virtualwrapper_CPPFLAGS = $(AM_CPPFLAGS) \
-DPOSTMAP=\"${POSTMAP}\" \
-DPOSTMAP_ARG=\"${POSTMAP_ARG}\"
libexec_PROGRAMS = queue bouncequeue familyqueue
sbin_SCRIPTS = sympa.pl bulk.pl alias_manager.pl task_manager.pl \
sympa_wizard.pl sympa_newaliases.pl
libexec_PROGRAMS = queue bouncequeue familyqueue sympa_newaliases-wrapper
queue_SOURCES = queue.c
queue_CPPFLAGS = $(AM_CPPFLAGS) -DSPOOLDIR=\"${spooldir}\"
bouncequeue_SOURCES = bouncequeue.c
bouncequeue_CPPFLAGS = $(AM_CPPFLAGS) -DSPOOLDIR=\"${spooldir}\"
familyqueue_SOURCES = familyqueue.c
familyqueue_CPPFLAGS = $(AM_CPPFLAGS) -DSPOOLDIR=\"${spooldir}\"
sympa_newaliases_wrapper_SOURCES = sympa_newaliases-wrapper.c
sympa_newaliases_wrapper_CPPFLAGS = $(AM_CPPFLAGS) \
-DSYMPA_NEWALIASES=\"${sbindir}/sympa_newaliases.pl\"
man1_MANS = sympa_newaliases.1
EXTRA_DIST = $(modules_DATA) \
bulk.pl.in \
alias_manager.pl.in \
sympa.pl.in \
sympa_wizard.pl.in \
task_manager.pl.in
task_manager.pl.in \
sympa_newaliases.pl.in
CLEANFILES = $(sbin_SCRIPTS)
CLEANFILES = $(man1_MANS) $(sbin_SCRIPTS)
install-exec-hook:
-chown $(USER) $(DESTDIR)$(libexecdir)/queue
......@@ -63,13 +61,9 @@ install-exec-hook:
-chgrp $(GROUP) $(DESTDIR)$(libexecdir)/familyqueue
chmod 4755 $(DESTDIR)$(libexecdir)/familyqueue
-chown root $(DESTDIR)$(sbindir)/aliaswrapper
-chgrp $(GROUP) $(DESTDIR)$(sbindir)/aliaswrapper
chmod 4750 aliaswrapper $(DESTDIR)$(sbindir)/aliaswrapper
-chown root $(DESTDIR)$(sbindir)/virtualwrapper
-chgrp $(GROUP) $(DESTDIR)$(sbindir)/virtualwrapper
chmod 4750 $(DESTDIR)$(sbindir)/virtualwrapper
-chown root $(DESTDIR)$(libexecdir)/sympa_newaliases-wrapper
-chgrp $(GROUP) $(DESTDIR)$(libexecdir)/sympa_newaliases-wrapper
chmod 4750 $(DESTDIR)$(libexecdir)/sympa_newaliases-wrapper
alias_manager.pl bulk.pl task_manager.pl sympa.pl sympa_wizard.pl: Makefile
rm -f $@
......@@ -84,3 +78,25 @@ bulk.pl: $(srcdir)/bulk.pl.in
sympa.pl: $(srcdir)/sympa.pl.in
sympa_wizard.pl: $(srcdir)/sympa_wizard.pl.in
task_manager.pl: $(srcdir)/task_manager.pl.in
sympa_newaliases.pl: $(srcdir)/sympa_newaliases.pl.in Makefile
rm -f $@
$(AM_V_GEN)$(SED) \
-e 's|--PERL--|$(PERL)|' \
-e 's|--libexecdir--|$(libexecdir)|' \
-e 's|--modulesdir--|$(modulesdir)|' \
-e 's|--CONFIG--|$(CONFIG)|' \
-e 's|--SENDMAIL_ALIASES--|$(SENDMAIL_ALIASES)|' \
-e 's|--MAKEMAP--|$(MAKEMAP)|' \
-e 's|--NEWALIASES--|$(NEWALIASES)|' \
-e 's|--NEWALIASES_ARG--|$(NEWALIASES_ARG)|' \
-e 's|--POSTALIAS--|$(POSTALIAS)|' \
-e 's|--POSTMAP--|$(POSTMAP)|' \
< $(srcdir)/$@.in > $@
chmod +x $@
.pl.1:
rm -f $@
$(AM_V_GEN)$(POD2MAN) --section=1 --center="sympa $(VERSION)" \
--lax --release="$(VERSION)" $< $@
......@@ -45,7 +45,7 @@ my $tmp_alias_file = $Conf{'tmpdir'}.'/sympa_aliases.'.time;
my $default_domain;
my $alias_wrapper = Sympa::Constants::SBINDIR . '/aliaswrapper';
my $alias_wrapper = Sympa::Constants::LIBEXECDIR . '/sympa_newaliases-wrapper';
my $lock_file = Sympa::Constants::EXPLDIR . '/alias_manager.lock';
my $path_to_queue = Sympa::Constants::LIBEXECDIR . '/queue';
my $path_to_bouncequeue = Sympa::Constants::LIBEXECDIR .'/bouncequeue';
......@@ -149,11 +149,11 @@ if ($operation eq 'add') {
my @deleted_lines;
while (my $alias = <ALIAS>) {
my $left_side = '';
$left_side = $1 if ($alias =~ /^([^:]+):/);
$left_side = $1 if ($alias =~ /^([^\s:]+)[\s:]/);
my $to_be_deleted = 0;
foreach my $new_alias (@aliases) {
next unless ($new_alias =~ /^([^:]+):/);
next unless ($new_alias =~ /^([^\s:]+)[\s:]/);
my $new_left_side = $1;
if ($left_side eq $new_left_side) {
......@@ -219,11 +219,11 @@ sub already_defined {
while (my $alias = <ALIAS>) {
# skip comment
next if $alias =~ /^#/ ;
$alias =~ /^([^:]+):/;
$alias =~ /^([^\s:]+)[\s:]/;
my $left_side = $1;
next unless ($left_side);
foreach (@aliases) {
next unless ($_ =~ /^([^:]+):/);
next unless ($_ =~ /^([^\s:]+)[\s:]/);
my $new_left_side = $1;
if ($left_side eq $new_left_side) {
print STDERR "Alias already defined : $left_side\n";
......
......@@ -113,7 +113,7 @@ foreach my $alias (@aliases) {
next if ($alias =~ /^\#/);
next if ($alias =~ /^\s*$/);
$alias =~ /^([^:]+):\s*\"\s*\|\s*(.*)\s+(.*)\s*\"$/;
$alias =~ /^([^\s:]+)[\s:]+\"\s*\|\s*(.*)\s+(.*)\s*\"$/;
my $alias_value = $1;
my $command_value = $2;
my $maildrop = $3;
......@@ -184,7 +184,7 @@ elsif ($operation eq 'del') {
next;
}
$alias =~ /^([^:]+):/;
$alias =~ /^([^\s:]+)[\s:]/;
my $alias_value = $1;
$alias_value =~ s/\+/\-/g;
......@@ -219,7 +219,7 @@ sub already_defined {
foreach my $alias (@aliases) {
$alias =~ /^([^:]+):/;
$alias =~ /^([^\s:]+)[\s:]/;
my $source_result = $ldap_connection->search(filter => "(".$ldap_mail_attribute."=".$1."\@".$domain.")",
base => $ldap_base_dn);
......
......@@ -85,7 +85,7 @@ if ($operation eq 'add') {
next;
}
$alias =~ /^([^:]+):\s*(\".*\")$/;
$alias =~ /^([^\s:]+)[\s:]+(\".*\")$/;
my $alias_value = $1;
my $command_value = $2;
$command_value =~ s/\"//g;
......@@ -112,7 +112,7 @@ elsif ($operation eq 'del') {
next;
}
$alias =~ /^([^:]+):/;
$alias =~ /^([^\s:]+)[\s:]/;
my $alias_value = $1;
$alias_value =~ s/\+/\-/g;
......@@ -141,7 +141,7 @@ sub already_defined {
next;
}
$alias =~ /^([^:]+):/;
$alias =~ /^([^\s:]+)[\s:]/;
my $alias_value = $1;
$alias_value =~ s/\+/\-/g;
......
......@@ -68,11 +68,12 @@ our $params_by_categories = &_get_parameters_names_by_category();
my %old_params = (
trusted_ca_options => 'capath,cafile',
msgcat => 'localedir',
'msgcat' => '',
queueexpire => '',
clean_delay_queueother => '',
dkim_header_list => '',
'dkim_header_list' => '',
web_recode_to => 'filesystem_encoding',
'localedir' => '',
);
## These parameters now have a hard-coded value
......
......@@ -4333,18 +4333,22 @@ sub send_msg {
my @verp_selected_tabrcpt = &extract_verp_rcpt($verp_rate, $xsequence,\@selected_tabrcpt, \@possible_verptabrcpt);
my $verp= 'off';
my $result = &mail::mail_message('message'=>$new_message,
'rcpt'=> \@selected_tabrcpt,
'list'=>$self,
'verp' => $verp,
'dkim_parameters'=>$dkim_parameters,
'tag_as_last' => $tags_to_use->{'tag_noverp'});
unless (defined $result) {
&Log::do_log('err',"List::send_msg, could not send message to distribute from $from (verp disabled)");
return undef;
if ($#selected_tabrcpt > -1) {
my $result = &mail::mail_message('message'=>$new_message,
'rcpt'=> \@selected_tabrcpt,
'list'=>$self,
'verp' => 'off',
'dkim_parameters'=>$dkim_parameters,
'tag_as_last' => $tags_to_use->{'tag_noverp'});
unless (defined $result) {
&do_log('err',"List::send_msg, could not send message to distribute from $from (verp desabled)");
return undef;
}
$tags_to_use->{'tag_noverp'} = 0 if ($result > 0);
$nbr_smtp += $result;
}else{
Log::do_log('notice','No non VERP subscribers left to distribute message from %s to list %s',$from,$self->{'name'});
}
$tags_to_use->{'tag_noverp'} = 0 if ($result > 0);
$nbr_smtp += $result;
$verp= 'on';
......@@ -4364,19 +4368,23 @@ sub send_msg {
next if ($array_name =~ /^tabrcpt_((nomail)|(summary)|(digest)|(digestplain))(_verp)?/);
## prepare VERP sending.
$result = &mail::mail_message('message'=> $new_message,
'rcpt'=> \@verp_selected_tabrcpt,
'list'=> $self,
'verp' => $verp,
'dkim_parameters'=>$dkim_parameters,
'tag_as_last' => $tags_to_use->{'tag_verp'});
unless (defined $result) {
&Log::do_log('err',"List::send_msg, could not send message to distribute from $from (verp enabled)");
return undef;
if ($#verp_selected_tabrcpt > -1) {
my $result = &mail::mail_message('message'=> $new_message,
'rcpt'=> \@verp_selected_tabrcpt,
'list'=> $self,
'verp' => 'on',
'dkim_parameters'=>$dkim_parameters,
'tag_as_last' => $tags_to_use->{'tag_verp'});
unless (defined $result) {
&do_log('err',"List::send_msg, could not send message to distribute from $from (verp enabled)");
return undef;
}
$tags_to_use->{'tag_verp'} = 0 if ($result > 0);
$nbr_smtp += $result;
$nbr_verp += $result;
}else{
Log::do_log('notice','No VERP subscribers left to distribute message from %s to list %s',$from,$self->{'name'});
}
$tags_to_use->{'tag_verp'} = 0 if ($result > 0);
$nbr_smtp += $result;
$nbr_verp += $result;
}
return $nbr_smtp;
}
......@@ -9837,8 +9845,11 @@ sub sync_include {
$new_subscribers->{$email}{'id'} =
$old_subscribers{$email}{'id'};
}
}
}
}
}
}
my $data_exclu;
my @subscriber_exclusion;
......@@ -13038,30 +13049,6 @@ sub _flush_list_db
}
}
##
## Method for UI
##
sub get_option_title {
my $self = shift;
my $option = shift;
my $type = shift || '';
my $withval = shift || 0;
my $map = { 'reception' => \%reception_mode,
'visibility' => \%visibility_mode,
'status' => \%list_status,
}->{$type} || \%list_option;
my $t = $map->{$option} || {};
if ($t->{'gettext_id'}) {
my $ret = gettext($t->{'gettext_id'});
$ret =~ s/^\s+//;
$ret =~ s/\s+$//;
return sprintf '%s (%s)', $ret, $option if $withval;
return $ret;
}
return $option;
}
=head2 Pluggin data-sources
......
......@@ -270,21 +270,27 @@ sub establish_connection {
}
}
# mysql: At first, reset "mysql_auto_reconnect" driver attribute.
# connect() sets it to true when the processes are running under
# mod_perl or CGI environment so that "SET NAMES utf8" will be skipped.
# mysql:
# - At first, reset "mysql_auto_reconnect" driver attribute.
# connect() sets it to true not according to \%attr argument
# when the processes are running under mod_perl or CGI environment so
# that "SET NAMES utf8" will be skipped.
# - Set client-side character set to "utf8" or "utf8mb4".
if ($self->{'db_type'} eq 'mysql') {
$self->{'dbh'}->{'mysql_auto_reconnect'} = 0;
unless (defined $self->{'dbh'}->do("SET NAMES 'utf8mb4'") or
defined $self->{'dbh'}->do("SET NAMES 'utf8'")) {
do_log('err', 'Cannot set client-side character set: %s',
$self->{'dbh'}->errstr);
}
}
# Configure Postgres to use ISO format dates
# Pg:
# - Configure Postgres to use ISO format dates.
# - Set client encoding to UTF8.
if ($self->{'db_type'} eq 'Pg') {
$self->{'dbh'}->do ("SET DATESTYLE TO 'ISO';");
}
## mysql or Pg: Set client encoding to UTF8
if ($self->{'db_type'} eq 'mysql' ||
$self->{'db_type'} eq 'Pg') {
$self->{'dbh'}->do("SET NAMES 'utf8'");
}
......
......@@ -29,13 +29,21 @@ sub gettext { shift } # to mark i18n'ed messages.
## title : Title for the group of parameters following
## name : Name of the parameter
## default: Default value
## file : Conf file where the param. is defined. If omitted, the parameter won't be added automatically to the config file, even if a default is set.
## default: Default value : DON'T SET AN EMPTY DEFAULT VALUE ! It's useless and can lead to errors on fresh install.
## file : Conf file where the parameter is defined. If omitted, the
## parameter won't be added automatically to the config file, even
## if a default is set.
## default: Default value : DON'T SET AN EMPTY DEFAULT VALUE ! It's useless
## and can lead to errors on fresh install.
## query : Description of the parameter
## file : Conf file where the param. is defined
## vhost : 1|0 : if 1, the parameter can have a specific value in a virtual host
## db : 'db_first','file_first','no'
## multiple : 1|0: If 1, the parameter can have mutiple values. Default i 0.
## advice : Additionnal advice concerning the parameter
## sample : FIXME FIXME
## edit : 1|0: FIXME FIXME
## optional: 1|0: FIXME FIXME
## vhost : 1|0 : if 1, the parameter can have a specific value in a
## virtual host
## db : 'db_first', 'file_first', 'no'
## obfuscated: 1|0: FIXME FIXME
## multiple: 1|0: If 1, the parameter can have mutiple values. Default is 0.
our @params = (
......@@ -47,7 +55,7 @@ our @params = (
'sample' => 'domain.tld',
'edit' => '1',
'file' => 'sympa.conf',
'vhost' => '1',
'vhost' => '1', #FIXME:not fully implemented yet.
},
{
'name' => 'email',
......@@ -454,15 +462,15 @@ our @params = (
edit => '1',
advice => gettext('This is the default language used by Sympa'),
},
{
name => 'supported_lang',
default => 'ca,cs,de,el,es,et_EE,en,fr,fi,hu,it,ja_JP,ko,nl,nb_NO,oc,pl,pt_BR,ru,sv,tr,vi,zh_CN,zh_TW',
query => 'Supported languages',
vhost => '1',
file => 'sympa.conf',
edit => '1',
advice => gettext("This is the set of language that will be proposed to your users for the Sympa GUI. Don't select a language if you don't have the proper locale packages installed."),
},
# {
# name => 'supported_lang',
# default => 'ca,cs,de,el,es,et_EE,en,fr,fi,hu,it,ja_JP,ko,nl,nb_NO,oc,pl,pt_BR,ru,sv,tr,vi,zh_CN,zh_TW',
# query => 'Supported languages',
# vhost => '1',
# file => 'sympa.conf',
# edit => '1',
# advice => gettext("This is the set of language that will be proposed to your users for the Sympa GUI. Don't select a language if you don't have the proper locale packages installed."),
# },
{ 'title' => gettext('Sending related') },
{
'name' => 'sendmail',
......@@ -489,7 +497,7 @@ our @params = (
},
{
'name' => 'automatic_list_removal',
'default' => 'none',
'default' => 'none', ## Can be 'if_empty'
'vhost' => '1',
},
{
......@@ -504,14 +512,14 @@ our @params = (
},
{
'name' => 'automatic_list_families',
'query' => 'Defines the name of the family the automatic lists are based on.',
'query' => 'Defines the name of the family the automatic lists are based on.',
'file' => 'sympa.conf',
'optional' => '1',
vhost => '1',
},
{
'name' => 'automatic_list_prefix',
'query' => 'Defines the prefix allowing to recognize that a list is an automatic list.',
'query' => 'Defines the prefix allowing to recognize that a list is an automatic list.',
'file' => 'sympa.conf',
'optional' => '1',
},
......@@ -544,7 +552,7 @@ our @params = (
{
'name' => 'max_size',
'query' => gettext('Default maximum size (in bytes) for messages (can be re-defined for each list)'),
'default' => '5242880',
'default' => '5242880', ## 5 MiB
'vhost' => '1',
'file' => 'sympa.conf',
'edit' => '1',
......@@ -633,7 +641,7 @@ our @params = (
},
{
'name' => 'urlize_min_size',
'default' => 10240, ## 10Kb,
'default' => 10240, ## 10 kiB,
},
{ 'title' => gettext('Bulk mailer') },
......@@ -648,6 +656,7 @@ our @params = (
'query' => gettext('Default priority for a packet to be sent by bulk.'),
'file' => 'sympa.conf',
'default' => '5',
vhost => '1',
},
{
name => 'sender_headers',
......@@ -702,6 +711,7 @@ our @params = (
'query' => gettext('Default disk quota for shared repository'),
'vhost' => '1',
'file' => 'sympa.conf',
'edit' => '1',
},
{
'name' => 'default_archive_quota',
......@@ -732,9 +742,9 @@ our @params = (
##name => 'dkim_header_list',
##vhost => '1',
##file => 'sympa.conf',
##query => 'list of headers to be included ito the message for signature',
##default => 'from:sender:reply-to:subject:date:message-id:to:cc:list-id:list-help:list-unsubscribe:list-subscribe:list-post:list-owner:list-archive:in-reply-to:references:resent-date:resent-from:resent-sender:resent-to:resent-cc:resent-message-id:mime-version:content-type:content-transfer-encoding:content-id:content-description',
##},
##query => 'list of headers to be included ito the message for signature',
##default => 'from:sender:reply-to:subject:date:message-id:to:cc:list-id:list-help:list-unsubscribe:list-subscribe:list-post:list-owner:list-archive:in-reply-to:references:resent-date:resent-from:resent-sender:resent-to:resent-cc:resent-message-id:mime-version:content-type:content-transfer-encoding:content-id:content-description',
##},
{ 'title' => 'S/MIME pluggin' },
{
'name' => 'queuemod',
......@@ -828,7 +838,7 @@ our @params = (
},
{
'name' => 'clean_delay_tmpdir',
'default' => '7,',
'default' => '7',
},