瀏覽代碼

Turn off ssl in dovecot when using mailpile

Bob Mottram 7 年之前
父節點
當前提交
adef1bb88f
共有 2 個檔案被更改,包括 7 行新增3 行删除
  1. 5
    1
      src/freedombone-app-mailpile
  2. 2
    2
      src/freedombone-base-email

+ 5
- 1
src/freedombone-app-mailpile 查看文件

@@ -446,9 +446,13 @@ function install_mailpile {
446 446
     pip install jinja2==2.9.6
447 447
     pip install pgpdump==1.5
448 448
 
449
+    # turn off ssl in dovecot
450
+    sed -i 's|#ssl =.*|ssl = no|g' /etc/dovecot/conf.d/10-ssl.conf
451
+    sed -i 's|ssl =.*|ssl = no|g' /etc/dovecot/conf.d/10-ssl.conf
452
+
453
+    # set ssl certs, just in case we want to use them later
449 454
     sed -i "s|#ssl_cert =.*|ssl_cert = </etc/ssl/certs/${DEFAULT_DOMAIN_NAME}.crt|g" /etc/dovecot/conf.d/10-ssl.conf
450 455
     sed -i "s|ssl_cert =.*|ssl_cert = </etc/ssl/certs/${DEFAULT_DOMAIN_NAME}.crt|g" /etc/dovecot/conf.d/10-ssl.conf
451
-
452 456
     sed -i "s|#ssl_key =.*|ssl_key = </etc/ssl/private/${DEFAULT_DOMAIN_NAME}.key|g" /etc/dovecot/conf.d/10-ssl.conf
453 457
     sed -i "s|ssl_key =.*|ssl_key = </etc/ssl/private/${DEFAULT_DOMAIN_NAME}.key|g" /etc/dovecot/conf.d/10-ssl.conf
454 458
 

+ 2
- 2
src/freedombone-base-email 查看文件

@@ -1345,8 +1345,8 @@ function configure_imap {
1345 1345
         echo $'Unable to find /etc/dovecot/conf.d/10-ssl.conf'
1346 1346
         exit 83629
1347 1347
     fi
1348
-    sed -i 's|#ssl =.*|ssl = required|g' /etc/dovecot/conf.d/10-ssl.conf
1349
-    sed -i 's|ssl =.*|ssl = required|g' /etc/dovecot/conf.d/10-ssl.conf
1348
+    sed -i 's|#ssl =.*|ssl = no|g' /etc/dovecot/conf.d/10-ssl.conf
1349
+    sed -i 's|ssl =.*|ssl = no|g' /etc/dovecot/conf.d/10-ssl.conf
1350 1350
     sed -i "s|#ssl_cert =.*|ssl_cert = </etc/ssl/certs/dovecot.crt|g" /etc/dovecot/conf.d/10-ssl.conf
1351 1351
     sed -i "s|ssl_cert =.*|ssl_cert = </etc/ssl/certs/dovecot.crt|g" /etc/dovecot/conf.d/10-ssl.conf
1352 1352
     sed -i "s|#ssl_key =.*|ssl_key = </etc/ssl/private/dovecot.key|g" /etc/dovecot/conf.d/10-ssl.conf