YunoHost/yunohost
1
0
Fork 0
mirror of https://github.com/YunoHost/yunohost.git synced 2024-09-03 20:06:10 +02:00
Code Issues Projects Releases Packages Wiki Activity

[enh] Use new rspamd configuration system to override metrics

Browse source
This commit is contained in:
Jérôme Lebleu 2016-03-28 19:11:50 +02:00
parent ee7c4e84aa
commit ca54418441
4 changed files with 14 additions and 1166 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
data/hooks/conf_regen/31-rspamd
View file

@ -14,8 +14,11 @@ function safe_copy () {
cd /usr/share/yunohost/templates/rspamd cd /usr/share/yunohost/templates/rspamd
# Copy Rspamd configuration # Create configuration directories
safe_copy metrics.conf /etc/rspamd/metrics.conf sudo mkdir -p /etc/rspamd/local.d /etc/rspamd/override.d
# Copy specific configuration to override the defaults
safe_copy metrics.conf.override /etc/rspamd/override.d/metrics.conf
# Install Rspamd sieve script # Install Rspamd sieve script
safe_copy rspamd.sieve /etc/dovecot/global_script/rspamd.sieve safe_copy rspamd.sieve /etc/dovecot/global_script/rspamd.sieve

1163
data/templates/rspamd/metrics.conf
View file

File diff suppressed because it is too large Load diff

8
data/templates/rspamd/metrics.conf.override Normal file
View file

@ -0,0 +1,8 @@
# Metrics settings
# This define overridden options.
actions {
reject = 21;
add_header = 8;
greylist = 4;
}

2
debian/control vendored
View file

@ -24,7 +24,7 @@ Depends: ${python:Depends}, ${misc:Depends}
, nginx-extras (>=1.6.2), php5-fpm, php5-ldap, php5-intl , nginx-extras (>=1.6.2), php5-fpm, php5-ldap, php5-intl
, dnsmasq, openssl, avahi-daemon , dnsmasq, openssl, avahi-daemon
, ssowat, metronome , ssowat, metronome
, rspamd, rmilter (>=1.7.0), redis-server, opendkim-tools , rspamd (>= 1.2.0), rmilter (>=1.7.0), redis-server, opendkim-tools
Recommends: yunohost-admin Recommends: yunohost-admin
, openssh-server, ntp, inetutils-ping | iputils-ping , openssh-server, ntp, inetutils-ping | iputils-ping
, bash-completion, rsyslog , bash-completion, rsyslog