浏览代码

Encrypt sent items

Bob Mottram 9 年前
父节点
当前提交
bdf4dd3285
共有 1 个文件被更改,包括 22 次插入1 次删除
  1. 22
    1
      src/freedombone-adduser

+ 22
- 1
src/freedombone-adduser 查看文件

@@ -28,6 +28,12 @@ if [ ! -d /home/$MY_USERNAME/Maildir ]; then
28 28
     exit 4
29 29
 fi
30 30
 
31
+if grep -q "set from=" /home/$MY_USERNAME/.muttrc; then
32
+    sed -i "s|set from=.*|set from='$MY_USERNAME <$MY_USERNAME@$HOSTNAME>'|g" /home/$MY_USERNAME/.muttrc
33
+else
34
+    echo "set from='$MY_USERNAME <$MY_USERNAME@$HOSTNAME>'" >> /home/$MY_USERNAME/.muttrc
35
+fi
36
+
31 37
 # generate a gpg key
32 38
 echo "Making a GPG key for $MY_USERNAME@$HOSTNAME"
33 39
 mkdir /home/$MY_USERNAME/.gnupg
@@ -64,6 +70,21 @@ if [ ! -f $MY_GPG_PUBLIC_KEY ]; then
64 70
     exit 5
65 71
 fi
66 72
 
73
+# encrypt outgoing mail to the "sent" folder
74
+if ! grep -q "pgp_encrypt_only_command" /home/$MY_USERNAME/.muttrc; then
75
+    echo '' >> /home/$MY_USERNAME/.muttrc
76
+    echo '# Encrypt items in the Sent folder' >> /home/$MY_USERNAME/.muttrc
77
+    echo "set pgp_encrypt_only_command=\"/usr/lib/mutt/pgpewrap gpg --batch --quiet --no-verbose --output - --encrypt --textmode --armor --always-trust --encrypt-to 0x$MY_GPG_PUBLIC_KEY_ID -- -r %r -- %f\"" >> /home/$MY_USERNAME/.muttrc
78
+else
79
+    sed -i "s|set pgp_encrypt_only_command.*|set pgp_encrypt_only_command=\"/usr/lib/mutt/pgpewrap gpg --batch --quiet --no-verbose --output - --encrypt --textmode --armor --always-trust --encrypt-to 0x$MY_GPG_PUBLIC_KEY_ID -- -r %r -- %f\"|g" /home/$MY_USERNAME/.muttrc
80
+fi
81
+
82
+if ! grep -q "pgp_encrypt_sign_command" /home/$MY_USERNAME/.muttrc; then
83
+    echo "set pgp_encrypt_sign_command=\"/usr/lib/mutt/pgpewrap gpg %?p?--passphrase-fd 0? --batch --quiet --no-verbose --textmode --output - --encrypt --sign %?a?-u %a? --armor --always-trust --encrypt-to 0x$MY_GPG_PUBLIC_KEY_ID -- -r %r -- %f\"" >> /home/$MY_USERNAME/.muttrc
84
+else
85
+    sed -i "s|set pgp_encrypt_sign_command.*|set pgp_encrypt_sign_command=\"/usr/lib/mutt/pgpewrap gpg %?p?--passphrase-fd 0? --batch --quiet --no-verbose --textmode --output - --encrypt --sign %?a?-u %a? --armor --always-trust --encrypt-to 0x$MY_GPG_PUBLIC_KEY_ID -- -r %r -- %f\"|g" /home/$MY_USERNAME/.muttrc
86
+fi
87
+
67 88
 if ! grep -q "Change your GPG password" /home/$MY_USERNAME/README; then
68 89
     echo '' >> /home/$MY_USERNAME/README
69 90
     echo '' >> /home/$MY_USERNAME/README
@@ -100,7 +121,7 @@ freedombone-addxmpp -e "$MY_USERNAME@$HOSTNAME" -p "$NEW_USER_PASSWORD"
100 121
 if [ ! "$?" = "0" ]; then
101 122
     echo "XMPP account not created"
102 123
     userdel -r $MY_USERNAME
103
-    exit 6  
124
+    exit 6
104 125
 fi
105 126
 
106 127
 clear