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

Merge remote-tracking branch 'origin/unstable' into unstable

Browse source
This commit is contained in:
Weblate 2016-01-19 22:56:50 +01:00
commit d004da1c5d
2 changed files with 1 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
data/hooks/conf_regen/28-rmilter
View file

@ -21,10 +21,6 @@ safe_copy rmilter.conf /etc/rmilter.conf
# Override socket configuration # Override socket configuration
safe_copy rmilter.socket /etc/systemd/system/rmilter.socket safe_copy rmilter.socket /etc/systemd/system/rmilter.socket
# Create the PID directory
sudo mkdir -p /run/rmilter
sudo chown -hR _rmilter: /run/rmilter
# Create DKIM key for each YunoHost domain # Create DKIM key for each YunoHost domain
sudo mkdir -p /etc/dkim sudo mkdir -p /etc/dkim
domain_list=$(sudo yunohost domain list --output-as plain) domain_list=$(sudo yunohost domain list --output-as plain)

2
debian/control vendored
View file

@ -34,7 +34,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, memcached, opendkim-tools rspamd, rmilter (>=1.7.0), redis-server, opendkim-tools
Recommends: yunohost-admin, Recommends: yunohost-admin,
bash-completion, rsyslog, ntp, openssh-server, bash-completion, rsyslog, ntp, openssh-server,
inetutils-ping | iputils-ping, inetutils-ping | iputils-ping,