Parcourir la source

Fixing mailpile

Bob Mottram il y a 8 ans
Parent
révision
4c3fb79caf
2 fichiers modifiés avec 10 ajouts et 6 suppressions
  1. 4
    0
      src/freedombone-app-mailpile
  2. 6
    6
      src/freedombone-base-email

+ 4
- 0
src/freedombone-app-mailpile Voir le fichier

270
 
270
 
271
     adduser --system --home=/var/www/$MAILPILE_DOMAIN_NAME/mail/ --group mailpile
271
     adduser --system --home=/var/www/$MAILPILE_DOMAIN_NAME/mail/ --group mailpile
272
     adduser mailpile debian-tor
272
     adduser mailpile debian-tor
273
+    adduser mailpile www-data
273
     chown -R mailpile: /var/www/$MAILPILE_DOMAIN_NAME/mail/
274
     chown -R mailpile: /var/www/$MAILPILE_DOMAIN_NAME/mail/
274
 
275
 
275
     # create folders and tags
276
     # create folders and tags
392
 
393
 
393
     disable_email_encryption_at_rest
394
     disable_email_encryption_at_rest
394
 
395
 
396
+    # if strict https is enforced then buttons don't work. This is probably a security bug
397
+    sed -i "s/Content-Security-Policy/d" $mailpile_nginx_site
398
+
395
     systemctl enable mailpile
399
     systemctl enable mailpile
396
     systemctl daemon-reload
400
     systemctl daemon-reload
397
     systemctl start mailpile
401
     systemctl start mailpile

+ 6
- 6
src/freedombone-base-email Voir le fichier

1290
     sed -i 's|#ssl =.*|ssl = required|g' /etc/dovecot/conf.d/10-ssl.conf
1290
     sed -i 's|#ssl =.*|ssl = required|g' /etc/dovecot/conf.d/10-ssl.conf
1291
     sed -i 's|ssl =.*|ssl = required|g' /etc/dovecot/conf.d/10-ssl.conf
1291
     sed -i 's|ssl =.*|ssl = required|g' /etc/dovecot/conf.d/10-ssl.conf
1292
     if [[ "$(cert_exists ${DEFAULT_DOMAIN_NAME} pem)" == "1" ]]; then
1292
     if [[ "$(cert_exists ${DEFAULT_DOMAIN_NAME} pem)" == "1" ]]; then
1293
-        sed -i "s|#ssl_cert =.*|ssl_cert = /etc/ssl/certs/${DEFAULT_DOMAIN_NAME}.pem|g" /etc/dovecot/conf.d/10-ssl.conf
1294
-        sed -i "s|ssl_cert =.*|ssl_cert = /etc/ssl/certs/${DEFAULT_DOMAIN_NAME}.pem|g" /etc/dovecot/conf.d/10-ssl.conf
1293
+        sed -i "s|#ssl_cert =.*|ssl_cert = </etc/ssl/certs/${DEFAULT_DOMAIN_NAME}.pem|g" /etc/dovecot/conf.d/10-ssl.conf
1294
+        sed -i "s|ssl_cert =.*|ssl_cert = </etc/ssl/certs/${DEFAULT_DOMAIN_NAME}.pem|g" /etc/dovecot/conf.d/10-ssl.conf
1295
     else
1295
     else
1296
-        sed -i "s|#ssl_cert =.*|ssl_cert = /etc/ssl/certs/${DEFAULT_DOMAIN_NAME}.crt|g" /etc/dovecot/conf.d/10-ssl.conf
1297
-        sed -i "s|ssl_cert =.*|ssl_cert = /etc/ssl/certs/${DEFAULT_DOMAIN_NAME}.crt|g" /etc/dovecot/conf.d/10-ssl.conf
1296
+        sed -i "s|#ssl_cert =.*|ssl_cert = </etc/ssl/certs/${DEFAULT_DOMAIN_NAME}.crt|g" /etc/dovecot/conf.d/10-ssl.conf
1297
+        sed -i "s|ssl_cert =.*|ssl_cert = </etc/ssl/certs/${DEFAULT_DOMAIN_NAME}.crt|g" /etc/dovecot/conf.d/10-ssl.conf
1298
     fi
1298
     fi
1299
-    sed -i "s|#ssl_key =.*|ssl_key = /etc/ssl/private/${DEFAULT_DOMAIN_NAME}.key|g" /etc/dovecot/conf.d/10-ssl.conf
1300
-    sed -i "s|ssl_key =.*|ssl_key = /etc/ssl/private/${DEFAULT_DOMAIN_NAME}.key|g" /etc/dovecot/conf.d/10-ssl.conf
1299
+    sed -i "s|#ssl_key =.*|ssl_key = </etc/ssl/private/${DEFAULT_DOMAIN_NAME}.key|g" /etc/dovecot/conf.d/10-ssl.conf
1300
+    sed -i "s|ssl_key =.*|ssl_key = </etc/ssl/private/${DEFAULT_DOMAIN_NAME}.key|g" /etc/dovecot/conf.d/10-ssl.conf
1301
     if [[ "$(cert_exists ${DEFAULT_DOMAIN_NAME})" == "1" ]]; then
1301
     if [[ "$(cert_exists ${DEFAULT_DOMAIN_NAME})" == "1" ]]; then
1302
         sed -i "s|#ssl_dh_parameters_length.*|ssl_dh_parameters_length = ${DH_KEYLENGTH}|g" /etc/dovecot/conf.d/10-ssl.conf
1302
         sed -i "s|#ssl_dh_parameters_length.*|ssl_dh_parameters_length = ${DH_KEYLENGTH}|g" /etc/dovecot/conf.d/10-ssl.conf
1303
     fi
1303
     fi