From 1548780640a0426e717d2b2555d1ad0d6f8d4e29 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@robotics.uk.to>
Date: Mon, 14 Nov 2016 09:49:01 +0000
Subject: [PATCH] Use onion address
---
src/freedombone-app-mailpile | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/freedombone-app-mailpile b/src/freedombone-app-mailpile
index 30b745d54..a6f1cf28b 100755
--- a/src/freedombone-app-mailpile
+++ b/src/freedombone-app-mailpile
@@ -277,6 +277,8 @@ function install_mailpile {
# create folders and tags
su -c "cd /var/www/$MAILPILE_DOMAIN_NAME/mail && ./mp --setup" - mailpile
+ MAILPILE_ONION_HOSTNAME=$(add_onion_service mailpile 80 ${MAILPILE_ONION_PORT})
+
echo '[Unit]' > /etc/systemd/system/mailpile.service
echo 'Description=Mailpile Email Client' >> /etc/systemd/system/mailpile.service
echo 'After=syslog.target network.target nginx.target' >> /etc/systemd/system/mailpile.service
@@ -331,12 +333,13 @@ function install_mailpile {
echo '' >> $mailpile_nginx_site
nginx_keybase ${MAILPILE_DOMAIN_NAME}
echo '}' >> $mailpile_nginx_site
+ echo '' >> $mailpile_nginx_site
else
echo -n '' > $mailpile_nginx_site
fi
echo 'server {' >> $mailpile_nginx_site
echo " listen 127.0.0.1:$MAILPILE_ONION_PORT default_server;" >> $mailpile_nginx_site
- echo " server_name $MAILPILE_DOMAIN_NAME;" >> $mailpile_nginx_site
+ echo " server_name $MAILPILE_ONION_HOSTNAME;" >> $mailpile_nginx_site
echo '' >> $mailpile_nginx_site
function_check nginx_disable_sniffing
nginx_disable_sniffing $MAILPILE_DOMAIN_NAME
@@ -382,8 +385,6 @@ function install_mailpile {
function_check nginx_ensite
nginx_ensite $MAILPILE_DOMAIN_NAME
- MAILPILE_ONION_HOSTNAME=$(add_onion_service mailpile 80 ${MAILPILE_ONION_PORT})
-
if ! grep -q "Mailpile onion domain" /home/$MY_USERNAME/README; then
echo $"Mailpile onion domain: ${MAILPILE_ONION_HOSTNAME}" >> /home/$MY_USERNAME/README
echo '' >> /home/$MY_USERNAME/README
--
GitLab