|
@@ -78,9 +78,6 @@ function backup_email {
|
78
|
78
|
}
|
79
|
79
|
|
80
|
80
|
function configure_firewall_for_email {
|
81
|
|
- if [[ $(is_completed $FUNCNAME) == "1" ]]; then
|
82
|
|
- return
|
83
|
|
- fi
|
84
|
81
|
if [[ $INSTALLED_WITHIN_DOCKER == "yes" ]]; then
|
85
|
82
|
# docker does its own firewalling
|
86
|
83
|
return
|
|
@@ -93,7 +90,6 @@ function configure_firewall_for_email {
|
93
|
90
|
firewall_add Email 587 tcp
|
94
|
91
|
firewall_add Email 465 tcp
|
95
|
92
|
firewall_add Imap 993 tcp
|
96
|
|
- mark_completed $FUNCNAME
|
97
|
93
|
}
|
98
|
94
|
|
99
|
95
|
function encrypt_incoming_email {
|
|
@@ -1588,8 +1584,7 @@ function configure_gpg {
|
1588
|
1584
|
if ! grep -q $"Change your GPG password" /home/$MY_USERNAME/README; then
|
1589
|
1585
|
echo '' >> /home/$MY_USERNAME/README
|
1590
|
1586
|
echo '' >> /home/$MY_USERNAME/README
|
1591
|
|
- echo $'Change your GPG password' >> /home/$MY_USERNAME/README
|
1592
|
|
- echo '========================' >> /home/$MY_USERNAME/README
|
|
1587
|
+ echo $'# Change your GPG password' >> /home/$MY_USERNAME/README
|
1593
|
1588
|
echo $"It's very important to add a password to your GPG key so that" >> /home/$MY_USERNAME/README
|
1594
|
1589
|
echo $"if anyone does get access to your email they still won't be able" >> /home/$MY_USERNAME/README
|
1595
|
1590
|
echo $'to read them without knowning the GPG password.' >> /home/$MY_USERNAME/README
|
|
@@ -1603,8 +1598,7 @@ function configure_gpg {
|
1603
|
1598
|
if ! grep -q $"Publish your GPG public key" /home/$MY_USERNAME/README; then
|
1604
|
1599
|
echo '' >> /home/$MY_USERNAME/README
|
1605
|
1600
|
echo '' >> /home/$MY_USERNAME/README
|
1606
|
|
- echo $'Publish your GPG public key' >> /home/$MY_USERNAME/README
|
1607
|
|
- echo '===========================' >> /home/$MY_USERNAME/README
|
|
1601
|
+ echo $'# Publish your GPG public key' >> /home/$MY_USERNAME/README
|
1608
|
1602
|
echo $'So that others can send emails to you securely you should' >> /home/$MY_USERNAME/README
|
1609
|
1603
|
echo $'publish your GPG public key with the command:' >> /home/$MY_USERNAME/README
|
1610
|
1604
|
echo '' >> /home/$MY_USERNAME/README
|
|
@@ -1649,6 +1643,12 @@ function install_email {
|
1649
|
1643
|
return
|
1650
|
1644
|
fi
|
1651
|
1645
|
|
|
1646
|
+ read_config_param ONION_ONLY
|
|
1647
|
+ read_config_param MY_USERNAME
|
|
1648
|
+ read_config_param DEFAULT_DOMAIN_NAME
|
|
1649
|
+ read_config_param MY_EMAIL_ADDRESS
|
|
1650
|
+ read_config_param DH_KEYLENGTH
|
|
1651
|
+
|
1652
|
1652
|
install_email_basic
|
1653
|
1653
|
#install_email_with_tor
|
1654
|
1654
|
|