summaryrefslogtreecommitdiffstats
path: root/roles/webmail/files/etc
diff options
context:
space:
mode:
Diffstat (limited to 'roles/webmail/files/etc')
-rw-r--r--roles/webmail/files/etc/cron.d/roundcube-core7
-rw-r--r--roles/webmail/files/etc/nginx/sites-available/roundcube23
-rw-r--r--roles/webmail/files/etc/php/fpm/pool.d/roundcube.conf22
-rw-r--r--roles/webmail/files/etc/roundcube/plugins/authres_status/config.inc.php5
-rw-r--r--roles/webmail/files/etc/roundcube/plugins/html5_notifier/config.inc.php6
-rw-r--r--roles/webmail/files/etc/roundcube/plugins/jqueryui/config.inc.php11
6 files changed, 47 insertions, 27 deletions
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 @@
+<?php
+
+$config['trusted_mtas'] = array('mx1.fripost.org', 'mx2.fripost.org');
+
+?>
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 @@
+<?php
+
+$config['html5_notifier_duration'] = '3';
+$config['html5_notifier_smbox'] = '1';
+
+?>
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 @@
-<?php
-
-// if you want to load localization strings for specific sub-libraries of jquery-ui, configure them here
-$config['jquery_ui_i18n'] = array('datepicker');
-
-// map Roundcube skins with jquery-ui themes here
-$config['jquery_ui_skin_map'] = array(
- 'default' => 'smoothness',
-);
-
-?>