From 8ad57960120f991c4ac2ee79f91e79c69e9620c3 Mon Sep 17 00:00:00 2001
From: Zhang Huangbin <zhb@iredmail.org>
Date: Tue, 4 Oct 2022 14:01:26 +0800
Subject: [PATCH] Completely switch to Ubuntu 22.04. closes #116

---
 config/etc/logrotate.d/{php7.4-fpm => php8.1-fpm}        | 0
 config/etc/php/{7.4 => 8.1}/conf.d/0-iredmail.ini        | 0
 config/etc/php/{7.4 => 8.1}/fpm/pool.d/www.conf          | 0
 config/etc/php/{7.4 => 8.1}/php-fpm.d/0-iredmail.conf    | 0
 config/etc/supervisor/conf-available/phpfpm.conf         | 2 +-
 config/opt/www/roundcubemail-1.5.3/config/config.inc.php | 5 +++--
 config/root/iRedMail/iRedMail.tips                       | 6 +++---
 7 files changed, 7 insertions(+), 6 deletions(-)
 rename config/etc/logrotate.d/{php7.4-fpm => php8.1-fpm} (100%)
 rename config/etc/php/{7.4 => 8.1}/conf.d/0-iredmail.ini (100%)
 rename config/etc/php/{7.4 => 8.1}/fpm/pool.d/www.conf (100%)
 rename config/etc/php/{7.4 => 8.1}/php-fpm.d/0-iredmail.conf (100%)

diff --git a/config/etc/logrotate.d/php7.4-fpm b/config/etc/logrotate.d/php8.1-fpm
similarity index 100%
rename from config/etc/logrotate.d/php7.4-fpm
rename to config/etc/logrotate.d/php8.1-fpm
diff --git a/config/etc/php/7.4/conf.d/0-iredmail.ini b/config/etc/php/8.1/conf.d/0-iredmail.ini
similarity index 100%
rename from config/etc/php/7.4/conf.d/0-iredmail.ini
rename to config/etc/php/8.1/conf.d/0-iredmail.ini
diff --git a/config/etc/php/7.4/fpm/pool.d/www.conf b/config/etc/php/8.1/fpm/pool.d/www.conf
similarity index 100%
rename from config/etc/php/7.4/fpm/pool.d/www.conf
rename to config/etc/php/8.1/fpm/pool.d/www.conf
diff --git a/config/etc/php/7.4/php-fpm.d/0-iredmail.conf b/config/etc/php/8.1/php-fpm.d/0-iredmail.conf
similarity index 100%
rename from config/etc/php/7.4/php-fpm.d/0-iredmail.conf
rename to config/etc/php/8.1/php-fpm.d/0-iredmail.conf
diff --git a/config/etc/supervisor/conf-available/phpfpm.conf b/config/etc/supervisor/conf-available/phpfpm.conf
index 0a283cd..82573a3 100644
--- a/config/etc/supervisor/conf-available/phpfpm.conf
+++ b/config/etc/supervisor/conf-available/phpfpm.conf
@@ -4,7 +4,7 @@
 ;
 
 [program:phpfpm]
-command=/usr/sbin/php-fpm7.4 -c /etc/php/7.4 -F
+command=/usr/sbin/php-fpm8.1 -c /etc/php/8.1 -F
 priority=30
 startsecs=0
 autostart=true
diff --git a/config/opt/www/roundcubemail-1.5.3/config/config.inc.php b/config/opt/www/roundcubemail-1.5.3/config/config.inc.php
index 1a9f230..16005cf 100644
--- a/config/opt/www/roundcubemail-1.5.3/config/config.inc.php
+++ b/config/opt/www/roundcubemail-1.5.3/config/config.inc.php
@@ -25,8 +25,9 @@
 $config['log_logins'] = true;
 
 // IMAP
-//$config['default_host'] = 'tls://127.0.0.1';
-$config['default_host'] = '127.0.0.1';
+// Local connection is considered as secure by Dovecot. If you have issue with
+// TLS enabled, try to remove the `tls://` prefix.
+$config['default_host'] = 'tls://127.0.0.1';
 $config['default_port'] = 143;
 $config['imap_auth_type'] = 'LOGIN';
 $config['imap_delimiter'] = '/';
diff --git a/config/root/iRedMail/iRedMail.tips b/config/root/iRedMail/iRedMail.tips
index 611d4c5..b4006e4 100755
--- a/config/root/iRedMail/iRedMail.tips
+++ b/config/root/iRedMail/iRedMail.tips
@@ -211,12 +211,12 @@ full email address.
 
 ## PHP
 
-* PHP config file: /etc/php/7.4/fpm/php.ini
+* PHP config file: /etc/php/8.1/fpm/php.ini
 
 ## PHP-FPM
 
-* Main config file: /etc/php/7.4/fpm/php-fpm.conf
-* Default pool config file: /etc/php/7.4/fpm/pool.d/www.conf
+* Main config file: /etc/php/8.1/fpm/php-fpm.conf
+* Default pool config file: /etc/php/8.1/fpm/pool.d/www.conf
 * Log files: /var/log/php-fpm
 * Socket path: /run/php-fpm.socket