Bob Mottram пре 7 година
родитељ
комит
acebf591bc
1 измењених фајлова са 13 додато и 0 уклоњено
  1. 13
    0
      src/freedombone-app-mailpile

+ 13
- 0
src/freedombone-app-mailpile Прегледај датотеку

@@ -45,6 +45,7 @@ mailpile_variables=(MAILPILE_REPO
45 45
                     MAILPILE_CODE
46 46
                     ONION_ONLY
47 47
                     DDNS_PROVIDER
48
+                    DEFAULT_DOMAIN_NAME
48 49
                     MY_USERNAME)
49 50
 
50 51
 function logging_on_mailpile {
@@ -305,6 +306,11 @@ function install_mailpile {
305 306
     adduser mailpile www-data
306 307
     adduser mailpile mail
307 308
     adduser mailpile $MY_USERNAME
309
+    if [[ $ONION_ONLY == 'no' ]]; then
310
+        chgrp -R ssl-cert /etc/letsencrypt
311
+        chmod -R g=rX /etc/letsencrypt
312
+        usermod -a -G ssl-cert mailpile
313
+    fi
308 314
     chown -R mailpile: /var/www/$MAILPILE_DOMAIN_NAME/mail/
309 315
 
310 316
     # create folders and tags
@@ -440,6 +446,13 @@ function install_mailpile {
440 446
     pip install jinja2==2.9.6
441 447
     pip install pgpdump==1.5
442 448
 
449
+    sed -i "s|#ssl_cert =.*|ssl_cert = </etc/ssl/certs/${DEFAULT_DOMAIN_NAME}.crt|g" /etc/dovecot/conf.d/10-ssl.conf
450
+    sed -i "s|ssl_cert =.*|ssl_cert = </etc/ssl/certs/${DEFAULT_DOMAIN_NAME}.crt|g" /etc/dovecot/conf.d/10-ssl.conf
451
+
452
+    sed -i "s|#ssl_key =.*|ssl_key = </etc/ssl/private/${DEFAULT_DOMAIN_NAME}.key|g" /etc/dovecot/conf.d/10-ssl.conf
453
+    sed -i "s|ssl_key =.*|ssl_key = </etc/ssl/private/${DEFAULT_DOMAIN_NAME}.key|g" /etc/dovecot/conf.d/10-ssl.conf
454
+
455
+    systemctl restart dovecot
443 456
     systemctl enable mailpile
444 457
     systemctl daemon-reload
445 458
     systemctl start mailpile