free
/
freedombone
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

If we try to get too clever with the admin keyring it just doesn't work

This commit is contained in:
Bob Mottram 2016-11-13 21:23:44 +00:00
parent 2fbd344f69
commit 590674a2a0
1 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/freedombone-app-mailpile
View File

@ -407,19 +407,8 @@ function install_mailpile {
if [ -d /var/www/$MAILPILE_DOMAIN_NAME/mail/.gnupg ]; then if [ -d /var/www/$MAILPILE_DOMAIN_NAME/mail/.gnupg ]; then
mv /var/www/$MAILPILE_DOMAIN_NAME/mail/.gnupg /var/www/$MAILPILE_DOMAIN_NAME/mail/.gnupg_orig mv /var/www/$MAILPILE_DOMAIN_NAME/mail/.gnupg /var/www/$MAILPILE_DOMAIN_NAME/mail/.gnupg_orig
fi fi
if [ -d /var/www/$MAILPILE_DOMAIN_NAME/mail/Maildir ]; then cp -r /home/$MY_USERNAME/.gnupg /var/www/$MAILPILE_DOMAIN_NAME/mail/
mv /var/www/$MAILPILE_DOMAIN_NAME/mail/Maildir /var/www/$MAILPILE_DOMAIN_NAME/mail/.Maildir_orig
fi
if [ -f /var/www/$MAILPILE_DOMAIN_NAME/mail/.procmailrc ]; then
mv /var/www/$MAILPILE_DOMAIN_NAME/mail/.procmailrc /var/www/$MAILPILE_DOMAIN_NAME/mail/.procmailrc_orig
fi
ln -s /home/$MY_USERNAME/.gnupg /var/www/$MAILPILE_DOMAIN_NAME/mail/
ln -s /home/$MY_USERNAME/.procmailrc /var/www/$MAILPILE_DOMAIN_NAME/mail/
ln -s /home/$MY_USERNAME/Maildir /var/www/$MAILPILE_DOMAIN_NAME/mail/
chown -R mailpile:mailpile /var/www/$MAILPILE_DOMAIN_NAME/mail/.gnupg chown -R mailpile:mailpile /var/www/$MAILPILE_DOMAIN_NAME/mail/.gnupg
chown -R mailpile:mailpile /var/www/$MAILPILE_DOMAIN_NAME/mail/Maildir
chown mailpile:mailpile /var/www/$MAILPILE_DOMAIN_NAME/mail/.procmailrc
# unless the directory is executable we can't log in
chmod +x /var/www/$MAILPILE_DOMAIN_NAME/mail/.gnupg chmod +x /var/www/$MAILPILE_DOMAIN_NAME/mail/.gnupg
systemctl enable mailpile systemctl enable mailpile