From 590674a2a028a39c2c3170d533a95a34b1a9509a Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@robotics.uk.to>
Date: Sun, 13 Nov 2016 21:23:44 +0000
Subject: [PATCH] If we try to get too clever with the admin keyring it just
 doesn't work

---
 src/freedombone-app-mailpile | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/src/freedombone-app-mailpile b/src/freedombone-app-mailpile
index 15fc6791..30b745d5 100755
--- a/src/freedombone-app-mailpile
+++ b/src/freedombone-app-mailpile
@@ -407,19 +407,8 @@ function install_mailpile {
     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
     fi
-    if [ -d /var/www/$MAILPILE_DOMAIN_NAME/mail/Maildir ]; then
-        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/
+    cp -r /home/$MY_USERNAME/.gnupg /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/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
 
     systemctl enable mailpile