瀏覽代碼

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

Bob Mottram 8 年之前
父節點
當前提交
590674a2a0
共有 1 個檔案被更改,包括 1 行新增12 行删除
  1. 1
    12
      src/freedombone-app-mailpile

+ 1
- 12
src/freedombone-app-mailpile 查看文件

@@ -407,19 +407,8 @@ function install_mailpile {
407 407
     if [ -d /var/www/$MAILPILE_DOMAIN_NAME/mail/.gnupg ]; then
408 408
         mv /var/www/$MAILPILE_DOMAIN_NAME/mail/.gnupg /var/www/$MAILPILE_DOMAIN_NAME/mail/.gnupg_orig
409 409
     fi
410
-    if [ -d /var/www/$MAILPILE_DOMAIN_NAME/mail/Maildir ]; then
411
-        mv /var/www/$MAILPILE_DOMAIN_NAME/mail/Maildir /var/www/$MAILPILE_DOMAIN_NAME/mail/.Maildir_orig
412
-    fi
413
-    if [ -f /var/www/$MAILPILE_DOMAIN_NAME/mail/.procmailrc ]; then
414
-        mv /var/www/$MAILPILE_DOMAIN_NAME/mail/.procmailrc /var/www/$MAILPILE_DOMAIN_NAME/mail/.procmailrc_orig
415
-    fi
416
-    ln -s /home/$MY_USERNAME/.gnupg /var/www/$MAILPILE_DOMAIN_NAME/mail/
417
-    ln -s /home/$MY_USERNAME/.procmailrc /var/www/$MAILPILE_DOMAIN_NAME/mail/
418
-    ln -s /home/$MY_USERNAME/Maildir /var/www/$MAILPILE_DOMAIN_NAME/mail/
410
+    cp -r /home/$MY_USERNAME/.gnupg /var/www/$MAILPILE_DOMAIN_NAME/mail/
419 411
     chown -R mailpile:mailpile /var/www/$MAILPILE_DOMAIN_NAME/mail/.gnupg
420
-    chown -R mailpile:mailpile /var/www/$MAILPILE_DOMAIN_NAME/mail/Maildir
421
-    chown mailpile:mailpile /var/www/$MAILPILE_DOMAIN_NAME/mail/.procmailrc
422
-    # unless the directory is executable we can't log in
423 412
     chmod +x /var/www/$MAILPILE_DOMAIN_NAME/mail/.gnupg
424 413
 
425 414
     systemctl enable mailpile