Bob Mottram 8 лет назад
Родитель
Сommit
1548780640
1 измененных файлов: 4 добавлений и 3 удалений
  1. 4
    3
      src/freedombone-app-mailpile

+ 4
- 3
src/freedombone-app-mailpile Просмотреть файл

277
     # create folders and tags
277
     # create folders and tags
278
     su -c "cd /var/www/$MAILPILE_DOMAIN_NAME/mail && ./mp --setup" - mailpile
278
     su -c "cd /var/www/$MAILPILE_DOMAIN_NAME/mail && ./mp --setup" - mailpile
279
 
279
 
280
+    MAILPILE_ONION_HOSTNAME=$(add_onion_service mailpile 80 ${MAILPILE_ONION_PORT})
281
+
280
     echo '[Unit]' > /etc/systemd/system/mailpile.service
282
     echo '[Unit]' > /etc/systemd/system/mailpile.service
281
     echo 'Description=Mailpile Email Client' >> /etc/systemd/system/mailpile.service
283
     echo 'Description=Mailpile Email Client' >> /etc/systemd/system/mailpile.service
282
     echo 'After=syslog.target network.target nginx.target' >> /etc/systemd/system/mailpile.service
284
     echo 'After=syslog.target network.target nginx.target' >> /etc/systemd/system/mailpile.service
331
         echo '' >> $mailpile_nginx_site
333
         echo '' >> $mailpile_nginx_site
332
         nginx_keybase ${MAILPILE_DOMAIN_NAME}
334
         nginx_keybase ${MAILPILE_DOMAIN_NAME}
333
         echo '}' >> $mailpile_nginx_site
335
         echo '}' >> $mailpile_nginx_site
336
+        echo '' >> $mailpile_nginx_site
334
     else
337
     else
335
         echo -n '' > $mailpile_nginx_site
338
         echo -n '' > $mailpile_nginx_site
336
     fi
339
     fi
337
     echo 'server {' >> $mailpile_nginx_site
340
     echo 'server {' >> $mailpile_nginx_site
338
     echo "    listen 127.0.0.1:$MAILPILE_ONION_PORT default_server;" >> $mailpile_nginx_site
341
     echo "    listen 127.0.0.1:$MAILPILE_ONION_PORT default_server;" >> $mailpile_nginx_site
339
-    echo "    server_name $MAILPILE_DOMAIN_NAME;" >> $mailpile_nginx_site
342
+    echo "    server_name $MAILPILE_ONION_HOSTNAME;" >> $mailpile_nginx_site
340
     echo '' >> $mailpile_nginx_site
343
     echo '' >> $mailpile_nginx_site
341
     function_check nginx_disable_sniffing
344
     function_check nginx_disable_sniffing
342
     nginx_disable_sniffing $MAILPILE_DOMAIN_NAME
345
     nginx_disable_sniffing $MAILPILE_DOMAIN_NAME
382
     function_check nginx_ensite
385
     function_check nginx_ensite
383
     nginx_ensite $MAILPILE_DOMAIN_NAME
386
     nginx_ensite $MAILPILE_DOMAIN_NAME
384
 
387
 
385
-    MAILPILE_ONION_HOSTNAME=$(add_onion_service mailpile 80 ${MAILPILE_ONION_PORT})
386
-
387
     if ! grep -q "Mailpile onion domain" /home/$MY_USERNAME/README; then
388
     if ! grep -q "Mailpile onion domain" /home/$MY_USERNAME/README; then
388
         echo $"Mailpile onion domain: ${MAILPILE_ONION_HOSTNAME}" >> /home/$MY_USERNAME/README
389
         echo $"Mailpile onion domain: ${MAILPILE_ONION_HOSTNAME}" >> /home/$MY_USERNAME/README
389
         echo '' >> /home/$MY_USERNAME/README
390
         echo '' >> /home/$MY_USERNAME/README