From aba1438a4d188ae4ba20d2ee264212622809afd1 Mon Sep 17 00:00:00 2001 From: Guilhem Moulin Date: Sun, 17 May 2020 04:25:36 +0200 Subject: Roundcube: Port to Debian 10. We use the version from buster-backports (currently 1.4.4+dfsg.1-1~bpo10+1) for the elastic theme. --- roles/webmail/files/etc/cron.d/roundcube-core | 7 +++++++ .../files/etc/nginx/sites-available/roundcube | 23 +++++++-------------- .../files/etc/php/fpm/pool.d/roundcube.conf | 22 ++++++++++++++++++++ .../plugins/authres_status/config.inc.php | 5 +++++ .../plugins/html5_notifier/config.inc.php | 6 ++++++ .../etc/roundcube/plugins/jqueryui/config.inc.php | 11 ---------- .../program/resources/fripost_logo_black.png | Bin 0 -> 6567 bytes .../program/resources/fripost_logo_white.png | Bin 0 -> 5454 bytes .../skins/classic/images/fripost_logo.png | Bin 6567 -> 0 bytes .../roundcube/skins/larry/images/fripost_logo.png | Bin 5454 -> 0 bytes 10 files changed, 47 insertions(+), 27 deletions(-) create mode 100644 roles/webmail/files/etc/cron.d/roundcube-core create mode 100644 roles/webmail/files/etc/php/fpm/pool.d/roundcube.conf create mode 100644 roles/webmail/files/etc/roundcube/plugins/authres_status/config.inc.php create mode 100644 roles/webmail/files/etc/roundcube/plugins/html5_notifier/config.inc.php delete mode 100644 roles/webmail/files/etc/roundcube/plugins/jqueryui/config.inc.php create mode 100644 roles/webmail/files/usr/share/roundcube/program/resources/fripost_logo_black.png create mode 100644 roles/webmail/files/usr/share/roundcube/program/resources/fripost_logo_white.png delete mode 100644 roles/webmail/files/usr/share/roundcube/skins/classic/images/fripost_logo.png delete mode 100644 roles/webmail/files/usr/share/roundcube/skins/larry/images/fripost_logo.png (limited to 'roles/webmail/files') diff --git a/roles/webmail/files/etc/cron.d/roundcube-core b/roles/webmail/files/etc/cron.d/roundcube-core new file mode 100644 index 0000000..6d9e7af --- /dev/null +++ b/roles/webmail/files/etc/cron.d/roundcube-core @@ -0,0 +1,7 @@ +# +# Roundcube database cleaning: finally removes all records that are +# marked as deleted. +MAILTO=root + +# m h dom mon dow user command +0 5 * * * _roundcube /usr/share/roundcube/bin/cleandb.sh >/dev/null 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 @@ -6,10 +6,10 @@ server { 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; @@ -24,7 +24,7 @@ server { 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 @@ -48,23 +48,14 @@ server { 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)$" { diff --git a/roles/webmail/files/etc/php/fpm/pool.d/roundcube.conf b/roles/webmail/files/etc/php/fpm/pool.d/roundcube.conf new file mode 100644 index 0000000..1512d66 --- /dev/null +++ b/roles/webmail/files/etc/php/fpm/pool.d/roundcube.conf @@ -0,0 +1,22 @@ +[roundcube] +user = _roundcube +group = nogroup +listen = /run/php/php7.3-fpm@roundcube.sock +listen.owner = www-data +listen.group = www-data +listen.mode = 0600 +pm = dynamic +pm.max_children = 5 +pm.start_servers = 2 +pm.min_spare_servers = 1 +pm.max_spare_servers = 3 + +php_value[upload_max_filesize] = 25M +php_value[post_max_size] = 30M +php_value[memory_limit] = 64M +php_value[session.gc_maxlifetime] = 21600 +php_value[session.gc_divisor] = 500 +php_value[session.gc_probability] = 1 + +php_admin_value[upload_tmp_dir] = /var/lib/roundcube/temp +php_admin_value[open_basedir] = /var/lib/roundcube:/usr/share/roundcube:/etc/roundcube:/var/log/roundcube:/usr/share/php:/usr/share/javascript:/usr/lib/nodejs:/usr/share/tinymce:/usr/share/misc/magic:/dev diff --git a/roles/webmail/files/etc/roundcube/plugins/authres_status/config.inc.php b/roles/webmail/files/etc/roundcube/plugins/authres_status/config.inc.php new file mode 100644 index 0000000..8ee3bc7 --- /dev/null +++ b/roles/webmail/files/etc/roundcube/plugins/authres_status/config.inc.php @@ -0,0 +1,5 @@ + diff --git a/roles/webmail/files/etc/roundcube/plugins/html5_notifier/config.inc.php b/roles/webmail/files/etc/roundcube/plugins/html5_notifier/config.inc.php new file mode 100644 index 0000000..1ec7922 --- /dev/null +++ b/roles/webmail/files/etc/roundcube/plugins/html5_notifier/config.inc.php @@ -0,0 +1,6 @@ + diff --git a/roles/webmail/files/etc/roundcube/plugins/jqueryui/config.inc.php b/roles/webmail/files/etc/roundcube/plugins/jqueryui/config.inc.php deleted file mode 100644 index bb9720b..0000000 --- a/roles/webmail/files/etc/roundcube/plugins/jqueryui/config.inc.php +++ /dev/null @@ -1,11 +0,0 @@ - 'smoothness', -); - -?> diff --git a/roles/webmail/files/usr/share/roundcube/program/resources/fripost_logo_black.png b/roles/webmail/files/usr/share/roundcube/program/resources/fripost_logo_black.png new file mode 100644 index 0000000..7af586a Binary files /dev/null and b/roles/webmail/files/usr/share/roundcube/program/resources/fripost_logo_black.png differ diff --git a/roles/webmail/files/usr/share/roundcube/program/resources/fripost_logo_white.png b/roles/webmail/files/usr/share/roundcube/program/resources/fripost_logo_white.png new file mode 100644 index 0000000..c581a30 Binary files /dev/null and b/roles/webmail/files/usr/share/roundcube/program/resources/fripost_logo_white.png differ diff --git a/roles/webmail/files/usr/share/roundcube/skins/classic/images/fripost_logo.png b/roles/webmail/files/usr/share/roundcube/skins/classic/images/fripost_logo.png deleted file mode 100644 index 7af586a..0000000 Binary files a/roles/webmail/files/usr/share/roundcube/skins/classic/images/fripost_logo.png and /dev/null differ diff --git a/roles/webmail/files/usr/share/roundcube/skins/larry/images/fripost_logo.png b/roles/webmail/files/usr/share/roundcube/skins/larry/images/fripost_logo.png deleted file mode 100644 index c581a30..0000000 Binary files a/roles/webmail/files/usr/share/roundcube/skins/larry/images/fripost_logo.png and /dev/null differ -- cgit v1.2.3