Browse Source

Don't automatically pgp encrypt email on onion only systems

Bob Mottram 7 years ago
parent
commit
3ebbfe0ebb
1 changed files with 12 additions and 0 deletions
  1. 12
    0
      src/freedombone-base-email

+ 12
- 0
src/freedombone-base-email View File

@@ -299,6 +299,10 @@ function configure_email_onion {
299 299
       echo "  route_data = \${perl{onionLookup}{$RISEUP_EMAIL_ONION}}"
300 300
       echo "  no_more"; } > /etc/exim4/conf.d/router/905_exim4-config-riseup
301 301
 
302
+    if ! grep -q "*.onion" /etc/exim4/conf.d/router/200_exim4-config_primary
303
+       sed -i 's|domains = ! +local_domains|domains = ! +local_domains : ! *.onion : ! riseup.net|g' /etc/exim4/conf.d/router/200_exim4-config_primary
304
+    fi
305
+
302 306
     { echo "onionrelays:";
303 307
       echo "  driver    = manualroute";
304 308
       echo "  domains   = *.onion";
@@ -652,6 +656,14 @@ function email_client {
652 656
       echo '# Optional relay of SMTP via ISP';
653 657
       echo '#set smtp_url="smtps://username:password@isp_mail_domain:465/"'; } > /etc/Muttrc
654 658
 
659
+    if [[ "$ONION_ONLY" != 'no' ]]; then
660
+        # On onion only systems email is onion router anyway, with its
661
+        # own encryption system, so we don't need the additional pgp layer
662
+        # except perhaps for some additional confidence
663
+        sed -i 's|set pgp_autoencrypt|unset pgp_autoencrypt|g' /etc/Muttrc
664
+        sed -i 's|set pgp_autosign|unset pgp_autosign|g' /etc/Muttrc
665
+    fi
666
+
655 667
     # For viewing long URLs
656 668
     echo 'REGEXP (((http|https|ftp|gopher)|mailto)[.:][^ >"\t]*|www\.[-a-z0-9.]+)[^ .,;\t>">\):]' > "/home/$MY_USERNAME/.urlview"
657 669
     echo 'COMMAND lynx -dump -width=78 -nolist %s' >> "/home/$MY_USERNAME/.urlview"