1 files changed, 7 insertions, 16 deletions

diff --git a/roles/webmail/files/etc/nginx/sites-available/roundcube b/roles/webmail/files/etc/nginx/sites-available/roundcube
index ae73562..824e763 100644
--- a/roles/webmail/files/etc/nginx/sites-available/roundcube
+++ b/roles/webmail/files/etc/nginx/sites-available/roundcube
@@ -1,75 +1,66 @@
 server {
 
     listen      80;
     listen [::]:80;
 
     server_name    mail.fripost.org;
     server_name webmail.fripost.org;
 
-    include snippets/acme-challenge.conf;
+    include /etc/lacme/nginx.conf;
 
-    access_log  /var/log/nginx/roundcube.access.log;
-    error_log   /var/log/nginx/roundcube.error.log info;
+    access_log /var/log/nginx/roundcube.access.log;
+    error_log  /var/log/nginx/roundcube.error.log info;
 
     location / {
         return 301 https://$host$request_uri;
     }
 }
 
 
 server {
     listen      443 ssl http2;
     listen [::]:443 ssl http2;
 
     server_name    mail.fripost.org;
     server_name webmail.fripost.org;
 
-    root         /var/lib/roundcube;
+    root /var/lib/roundcube;
 
     include snippets/headers.conf;
     add_header Content-Security-Policy
                "default-src 'none'; child-src 'self'; frame-src 'self'; connect-src 'self'; object-src 'self'; script-src 'self' 'unsafe-inline' 'unsafe-eval'; style-src 'self' 'unsafe-inline'; img-src * data:; font-src 'self'; reflected-xss block; referrer no-referrer-when-downgrade; frame-ancestors 'self'; form-action 'self'; base-uri mail.fripost.org webmail.fripost.org";
 
     include snippets/ssl.conf;
     ssl_certificate     ssl/mail.fripost.org.pem;
     ssl_certificate_key ssl/mail.fripost.org.key;
     include             snippets/mail.fripost.org.hpkp-hdr;
 
     location = /favicon.ico {
         root          /usr/share/roundcube/skins/default/images;
         log_not_found off;
         access_log    off;
         expires       max;
     }
 
     location = /robots.txt {
         allow         all;
         log_not_found off;
         access_log    off;
     }
 
-    access_log  /var/log/nginx/roundcube.access.log;
-    error_log   /var/log/nginx/roundcube.error.log info;
+    access_log /var/log/nginx/roundcube.access.log;
+    error_log  /var/log/nginx/roundcube.error.log info;
 
     client_max_body_size 64m;
     location = / { index index.php; }
     location = /index.php {
         include snippets/fastcgi-php-ssl.conf;
-
-        # From /var/lib/roundcube/.htaccess
-        fastcgi_param PHP_VALUE "upload_max_filesize=25M
-                                 post_max_size=30M
-                                 memory_limit=64M
-                                 session.gc_maxlifetime=21600
-                                 session.gc_divisor=500
-                                 session.gc_probability=1";
-        fastcgi_param PHP_ADMIN_VALUE "open_basedir=$document_root:/usr/share/roundcube:/etc/roundcube:/var/log/roundcube:/usr/share/php:/usr/share/javascript:/usr/share/tinymce:/usr/share/misc/magic:/dev
-                                       upload_tmp_dir=$document_root/temp";
+        fastcgi_pass unix:/var/run/php/php7.3-fpm@roundcube.sock;
     }
 
     location ~ "^/(?:plugins|program/js|program/resources|skins)/.*[^./]\.(?:css|eot|gif|html|ico|jpg|js|pdf|png|svg|tif|ttf|woff)$" {
         try_files $uri =404;
         expires 30d;
     }
     location / { internal; }
 }