Bläddra i källkod

Email install sequence

Bob Mottram 7 år sedan
förälder
incheckning
c85ddcb63d
2 ändrade filer med 5 tillägg och 3 borttagningar
  1. 2
    0
      src/freedombone-utils-gpg
  2. 3
    3
      src/freedombone-utils-setup

+ 2
- 0
src/freedombone-utils-gpg Visa fil

@@ -39,6 +39,8 @@ function gpg_update_mutt {
39 39
     CURR_GPG_ID=$(gpg --homedir=/home/$key_username/.gnupg --list-keys $CURR_EMAIL_ADDRESS | sed -n '2p' | sed 's/^[ \t]*//')
40 40
 
41 41
     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 --trust-model always --encrypt-to $CURR_GPG_ID -- -r %r -- %f\"|g" /home/$key_username/.muttrc
42
+    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 --trust-model always --encrypt-to $CURR_GPG_ID -- -r %r -- %f\"|g" /home/$key_username/.muttrc
43
+
42 44
     chown $key_username:$key_username /home/$key_username/.muttrc
43 45
 }
44 46
 

+ 3
- 3
src/freedombone-utils-setup Visa fil

@@ -917,15 +917,15 @@ function setup_email {
917 917
     #function_check install_monkeysphere
918 918
     #install_monkeysphere
919 919
 
920
+    function_check email_client
921
+    email_client
922
+
920 923
     function_check encrypt_incoming_email
921 924
     encrypt_incoming_email
922 925
 
923 926
     function_check encrypt_outgoing_email
924 927
     encrypt_outgoing_email
925 928
 
926
-    function_check email_client
927
-    email_client
928
-
929 929
     function_check email_archiving
930 930
     email_archiving
931 931