Browse Source

Read config parameters before email install

Bob Mottram 8 years ago
parent
commit
47a00002fb
1 changed files with 8 additions and 8 deletions
  1. 8
    8
      src/freedombone-base-email

+ 8
- 8
src/freedombone-base-email View File

78
 }
78
 }
79
 
79
 
80
 function configure_firewall_for_email {
80
 function configure_firewall_for_email {
81
-    if [[ $(is_completed $FUNCNAME) == "1" ]]; then
82
-        return
83
-    fi
84
     if [[ $INSTALLED_WITHIN_DOCKER == "yes" ]]; then
81
     if [[ $INSTALLED_WITHIN_DOCKER == "yes" ]]; then
85
         # docker does its own firewalling
82
         # docker does its own firewalling
86
         return
83
         return
93
     firewall_add Email 587 tcp
90
     firewall_add Email 587 tcp
94
     firewall_add Email 465 tcp
91
     firewall_add Email 465 tcp
95
     firewall_add Imap 993 tcp
92
     firewall_add Imap 993 tcp
96
-    mark_completed $FUNCNAME
97
 }
93
 }
98
 
94
 
99
 function encrypt_incoming_email {
95
 function encrypt_incoming_email {
1588
             if ! grep -q $"Change your GPG password" /home/$MY_USERNAME/README; then
1584
             if ! grep -q $"Change your GPG password" /home/$MY_USERNAME/README; then
1589
                 echo '' >> /home/$MY_USERNAME/README
1585
                 echo '' >> /home/$MY_USERNAME/README
1590
                 echo '' >> /home/$MY_USERNAME/README
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
                 echo $"It's very important to add a password to your GPG key so that" >> /home/$MY_USERNAME/README
1588
                 echo $"It's very important to add a password to your GPG key so that" >> /home/$MY_USERNAME/README
1594
                 echo $"if anyone does get access to your email they still won't be able" >> /home/$MY_USERNAME/README
1589
                 echo $"if anyone does get access to your email they still won't be able" >> /home/$MY_USERNAME/README
1595
                 echo $'to read them without knowning the GPG password.' >> /home/$MY_USERNAME/README
1590
                 echo $'to read them without knowning the GPG password.' >> /home/$MY_USERNAME/README
1603
             if ! grep -q $"Publish your GPG public key" /home/$MY_USERNAME/README; then
1598
             if ! grep -q $"Publish your GPG public key" /home/$MY_USERNAME/README; then
1604
                 echo '' >> /home/$MY_USERNAME/README
1599
                 echo '' >> /home/$MY_USERNAME/README
1605
                 echo '' >> /home/$MY_USERNAME/README
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
                 echo $'So that others can send emails to you securely you should' >> /home/$MY_USERNAME/README
1602
                 echo $'So that others can send emails to you securely you should' >> /home/$MY_USERNAME/README
1609
                 echo $'publish your GPG public key with the command:' >> /home/$MY_USERNAME/README
1603
                 echo $'publish your GPG public key with the command:' >> /home/$MY_USERNAME/README
1610
                 echo '' >> /home/$MY_USERNAME/README
1604
                 echo '' >> /home/$MY_USERNAME/README
1649
         return
1643
         return
1650
     fi
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
     install_email_basic
1652
     install_email_basic
1653
     #install_email_with_tor
1653
     #install_email_with_tor
1654
 
1654