Bläddra i källkod

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

Bob Mottram 8 år sedan
förälder
incheckning
590674a2a0
1 ändrade filer med 1 tillägg och 12 borttagningar
  1. 1
    12
      src/freedombone-app-mailpile

+ 1
- 12
src/freedombone-app-mailpile Visa fil

407
     if [ -d /var/www/$MAILPILE_DOMAIN_NAME/mail/.gnupg ]; then
407
     if [ -d /var/www/$MAILPILE_DOMAIN_NAME/mail/.gnupg ]; then
408
         mv /var/www/$MAILPILE_DOMAIN_NAME/mail/.gnupg /var/www/$MAILPILE_DOMAIN_NAME/mail/.gnupg_orig
408
         mv /var/www/$MAILPILE_DOMAIN_NAME/mail/.gnupg /var/www/$MAILPILE_DOMAIN_NAME/mail/.gnupg_orig
409
     fi
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
     chown -R mailpile:mailpile /var/www/$MAILPILE_DOMAIN_NAME/mail/.gnupg
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
     chmod +x /var/www/$MAILPILE_DOMAIN_NAME/mail/.gnupg
412
     chmod +x /var/www/$MAILPILE_DOMAIN_NAME/mail/.gnupg
424
 
413
 
425
     systemctl enable mailpile
414
     systemctl enable mailpile