Skip to content
Snippets Groups Projects
Commit 47a00002 authored by Bob Mottram's avatar Bob Mottram
Browse files

Read config parameters before email install

parent 4b635216
No related branches found
No related tags found
No related merge requests found
......@@ -78,9 +78,6 @@ function backup_email {
}
function configure_firewall_for_email {
if [[ $(is_completed $FUNCNAME) == "1" ]]; then
return
fi
if [[ $INSTALLED_WITHIN_DOCKER == "yes" ]]; then
# docker does its own firewalling
return
......@@ -93,7 +90,6 @@ function configure_firewall_for_email {
firewall_add Email 587 tcp
firewall_add Email 465 tcp
firewall_add Imap 993 tcp
mark_completed $FUNCNAME
}
function encrypt_incoming_email {
......@@ -1588,8 +1584,7 @@ function configure_gpg {
if ! grep -q $"Change your GPG password" /home/$MY_USERNAME/README; then
echo '' >> /home/$MY_USERNAME/README
echo '' >> /home/$MY_USERNAME/README
echo $'Change your GPG password' >> /home/$MY_USERNAME/README
echo '========================' >> /home/$MY_USERNAME/README
echo $'# Change your GPG password' >> /home/$MY_USERNAME/README
echo $"It's very important to add a password to your GPG key so that" >> /home/$MY_USERNAME/README
echo $"if anyone does get access to your email they still won't be able" >> /home/$MY_USERNAME/README
echo $'to read them without knowning the GPG password.' >> /home/$MY_USERNAME/README
......@@ -1603,8 +1598,7 @@ function configure_gpg {
if ! grep -q $"Publish your GPG public key" /home/$MY_USERNAME/README; then
echo '' >> /home/$MY_USERNAME/README
echo '' >> /home/$MY_USERNAME/README
echo $'Publish your GPG public key' >> /home/$MY_USERNAME/README
echo '===========================' >> /home/$MY_USERNAME/README
echo $'# Publish your GPG public key' >> /home/$MY_USERNAME/README
echo $'So that others can send emails to you securely you should' >> /home/$MY_USERNAME/README
echo $'publish your GPG public key with the command:' >> /home/$MY_USERNAME/README
echo '' >> /home/$MY_USERNAME/README
......@@ -1649,6 +1643,12 @@ function install_email {
return
fi
read_config_param ONION_ONLY
read_config_param MY_USERNAME
read_config_param DEFAULT_DOMAIN_NAME
read_config_param MY_EMAIL_ADDRESS
read_config_param DH_KEYLENGTH
install_email_basic
#install_email_with_tor
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment