|
@@ -88,21 +88,17 @@ if [ "$SSH_PUBLIC_KEY" ]; then
|
88
|
88
|
fi
|
89
|
89
|
fi
|
90
|
90
|
|
91
|
|
-if [ ! -d /home/$MY_USERNAME/Maildir ]; then
|
92
|
|
- echo $'Email directory was not created'
|
93
|
|
- userdel -r $MY_USERNAME
|
94
|
|
- exit 6
|
95
|
|
-fi
|
|
91
|
+if [ -d /home/$MY_USERNAME/Maildir ]; then
|
|
92
|
+ if grep -q "set from=" /home/$MY_USERNAME/.muttrc; then
|
|
93
|
+ sed -i "s|set from=.*|set from='$MY_USERNAME <$MY_USERNAME@$HOSTNAME>'|g" /home/$MY_USERNAME/.muttrc
|
|
94
|
+ else
|
|
95
|
+ echo "set from='$MY_USERNAME <$MY_USERNAME@$HOSTNAME>'" >> /home/$MY_USERNAME/.muttrc
|
|
96
|
+ fi
|
96
|
97
|
|
97
|
|
-if grep -q "set from=" /home/$MY_USERNAME/.muttrc; then
|
98
|
|
- sed -i "s|set from=.*|set from='$MY_USERNAME <$MY_USERNAME@$HOSTNAME>'|g" /home/$MY_USERNAME/.muttrc
|
99
|
|
-else
|
100
|
|
- echo "set from='$MY_USERNAME <$MY_USERNAME@$HOSTNAME>'" >> /home/$MY_USERNAME/.muttrc
|
|
98
|
+ USERN='$USER@'
|
|
99
|
+ sed -i "s|$USERN|$MY_USERNAME@|g" /home/$MY_USERNAME/.procmailrc
|
101
|
100
|
fi
|
102
|
101
|
|
103
|
|
-USERN='$USER@'
|
104
|
|
-sed -i "s|$USERN|$MY_USERNAME@|g" /home/$MY_USERNAME/.procmailrc
|
105
|
|
-
|
106
|
102
|
# generate a gpg key
|
107
|
103
|
echo "Making a GPG key for $MY_USERNAME@$HOSTNAME"
|
108
|
104
|
mkdir /home/$MY_USERNAME/.gnupg
|
|
@@ -139,19 +135,21 @@ if [ ! -f $MY_GPG_PUBLIC_KEY ]; then
|
139
|
135
|
exit 7
|
140
|
136
|
fi
|
141
|
137
|
|
142
|
|
-# encrypt outgoing mail to the "sent" folder
|
143
|
|
-if ! grep -q "pgp_encrypt_only_command" /home/$MY_USERNAME/.muttrc; then
|
144
|
|
- echo '' >> /home/$MY_USERNAME/.muttrc
|
145
|
|
- echo $'# Encrypt items in the Sent folder' >> /home/$MY_USERNAME/.muttrc
|
146
|
|
- 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
|
147
|
|
-else
|
148
|
|
- 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
|
149
|
|
-fi
|
|
138
|
+if [ -f /home/$MY_USERNAME/.muttrc ]; then
|
|
139
|
+ # encrypt outgoing mail to the "sent" folder
|
|
140
|
+ if ! grep -q "pgp_encrypt_only_command" /home/$MY_USERNAME/.muttrc; then
|
|
141
|
+ echo '' >> /home/$MY_USERNAME/.muttrc
|
|
142
|
+ echo $'# Encrypt items in the Sent folder' >> /home/$MY_USERNAME/.muttrc
|
|
143
|
+ 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
|
|
144
|
+ else
|
|
145
|
+ 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
|
|
146
|
+ fi
|
150
|
147
|
|
151
|
|
-if ! grep -q "pgp_encrypt_sign_command" /home/$MY_USERNAME/.muttrc; then
|
152
|
|
- 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
|
153
|
|
-else
|
154
|
|
- 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
|
|
148
|
+ if ! grep -q "pgp_encrypt_sign_command" /home/$MY_USERNAME/.muttrc; then
|
|
149
|
+ 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
|
|
150
|
+ else
|
|
151
|
+ 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
|
|
152
|
+ fi
|
155
|
153
|
fi
|
156
|
154
|
|
157
|
155
|
if ! grep -q "Change your GPG password" /home/$MY_USERNAME/README; then
|