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 2015-10-31 14:15:04 +01:00
commit 6e2b9252b8
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
data/hooks/conf_regen/22-email-legacy
View file

@ -8,6 +8,9 @@ sudo yunohost service add rspamd -l /var/log/mail.log \
sudo yunohost service add rmilter -l /var/log/mail.log \ sudo yunohost service add rmilter -l /var/log/mail.log \
|| echo "Rspamd is already listed in services" || echo "Rspamd is already listed in services"
sudo yunohost service add memcached \
|| echo "Memcached is already listed in services"
# Remove previous email services # Remove previous email services
sudo yunohost service disable spamassassin \ sudo yunohost service disable spamassassin \
|| echo "Spamassassin is already removed" \ || echo "Spamassassin is already removed" \

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

@ -16,7 +16,7 @@ function safe_copy () {
cd /usr/share/yunohost/templates/rmilter cd /usr/share/yunohost/templates/rmilter
# Copy Rmilter configuration # Copy Rmilter configuration
safe_copy rmilter.conf /etc/rmilter/rmilter.conf safe_copy rmilter.conf /etc/rmilter.conf
# Create the PID directory # Create the PID directory
sudo mkdir -p /var/run/rmilter sudo mkdir -p /var/run/rmilter
@ -28,7 +28,11 @@ domain_list=$(sudo yunohost domain list --plain)
for domain in $domain_list; do for domain in $domain_list; do
[ -f /etc/dkim/$domain.mail.key ] \ [ -f /etc/dkim/$domain.mail.key ] \
|| sudo opendkim-genkey --domain=$domain --selector=mail || (sudo opendkim-genkey --domain=$domain \
--selector=mail\
--directory=/etc/dkim \
&& sudo mv /etc/dkim/mail.private /etc/dkim/$domain.mail.key \
&& sudo mv /etc/dkim/mail.txt /etc/dkim/$domain.mail.txt)
sudo chown _rmilter /etc/dkim/$domain.mail.key sudo chown _rmilter /etc/dkim/$domain.mail.key
sudo chmod 400 /etc/dkim/$domain.mail.key sudo chmod 400 /etc/dkim/$domain.mail.key