Sync with latest iRedMail Easy release 2022121901.

Dockerfiles/iredapd

@@ -11,14 +11,14 @@ RUN /bin/sh ${SCRIPTS_DIR}/add_user_iredapd.sh && \
 
 RUN apt-get update && apt-get upgrade -y && apt-get install -y --no-install-recommends python3-sqlalchemy python3-dnspython python3-pymysql python3-ldap python3-psycopg2 python3-more-itertools && \
     apt-get clean && apt-get autoclean && rm -rf /var/lib/apt/lists/* && \
-    wget -c https://github.com/iredmail/iRedAPD/archive/5.1.tar.gz && \
-    tar xzf 5.1.tar.gz -C /opt && \
-    rm -f 5.1.tar.gz && \
-    ln -sf /opt/iRedAPD-5.1 /opt/iredapd && \
+    wget -c https://github.com/iredmail/iRedAPD/archive/5.1.2.tar.gz && \
+    tar xzf 5.1.2.tar.gz -C /opt && \
+    rm -f 5.1.2.tar.gz && \
+    ln -sf /opt/iRedAPD-5.1.2 /opt/iredapd && \
     /usr/bin/pip3 install --no-cache-dir --no-deps web.py==0.62 && \
     rm -rf /root/.cache
 
-COPY ./config/opt/iRedAPD-5.1/. /opt/iRedAPD-5.1/
+COPY ./config/opt/iRedAPD-5.1.2/. /opt/iRedAPD-5.1.2/
 COPY ./entrypoints/iredapd.sh /entrypoint.sh
 
 CMD /bin/sh /entrypoint.sh

README.md

@@ -2,7 +2,7 @@ __WARNING__: THIS IS A BETA EDITION AND NOT ALWAYS STABLE, DO NOT TRY IT IN PROD
 
 - Source code is hosted on [GitHub](https://github.com/iredmail/dockerized).
   Bug report, feedback, patches are always welcome.
-- Base image is [Ubuntu 20.04 (focal)](https://hub.docker.com/_/ubuntu).
+- Base image is [Ubuntu 22.04 (jammy)](https://hub.docker.com/_/ubuntu).
 - Dockerized iRedMail follows the [Best Practice of iRedMail Easy platform](https://docs.iredmail.org/iredmail-easy.best.practice.html).
 - 2 tags are available:
   - `iredmail/mariadb:stable`: Stable version.

config/etc/dovecot/dovecot.conf

@@ -34,7 +34,7 @@ listen = *
 protocols = pop3 imap sieve lmtp
 
 # Plugins
-mail_plugins = acl mail_log mailbox_alias notify quota  
+mail_plugins = acl mail_log mailbox_alias notify quota  fts fts_xapian
 
 # Required by OpenBSD
 base_dir = /run/dovecot
@@ -496,6 +496,8 @@ service quota-warning {
     }
 }
 
+
+
 service quota-status {
     # '-p <protocol>'. Currently only 'postfix' protocol is supported.
     executable = quota-status -p postfix
@@ -506,6 +508,7 @@ service quota-status {
     }
 }
 
+
 #
 # Plugins
 #

config/etc/iredmail-release

@@ -1 +1 @@
-2022082201 (mariadb backend, dockerized edition: https://www.iredmail.org/)
+2022121901 (mariadb backend, dockerized edition: https://www.iredmail.org/)

config/etc/spamassassin/local.cf

@@ -142,7 +142,7 @@ score URIBL_ABUSE_SURBL 5
 score SURBL_BLOCKED 0
 
 # multi.urlbl.com
-score URIBL_BLACK 10
+#score URIBL_BLACK 10
 #score URIBL_GREY 3
 #score URIBL_RED 0
 score URIBL_BLOCKED 0

config/opt/www/roundcubemail-1.5.3/config/config.inc.php

@@ -77,7 +77,7 @@
 $config['auto_create_user'] = true;
 $config['force_https'] = true;
 $config['login_autocomplete'] = 2;
-$config['ip_check'] = true;
+$config['ip_check'] = false;
 $config['des_key'] = 'PH_ROUNDCUBE_DES_KEY';
 $config['cipher_method'] = 'AES-256-CBC';
 $config['useragent'] = 'Roundcube Webmail'; // Hide version number

config/root/iRedMail/iRedMail.tips

@@ -3,7 +3,7 @@ postmaster each time you launch the container.
 
 ###########################################################################
 # iRedMail: https://www.iredmail.org/
-# Version: 2022082201
+# Version: 2022121901
 # Backend: mariadb
 ###########################################################################
 
@@ -166,7 +166,7 @@ full email address.
 
 ## iRedAPD - Postfix Policy Server:
 
-* Version: 5.1
+* Version: 5.1.2
 * Listen address: 0.0.0.0, port: 7777
 * SQL database account:
     - Database name: iredapd

entrypoints/iredadmin.sh

@@ -8,7 +8,7 @@
 
 . /docker/entrypoints/functions.sh
 
-IREDADMIN_WEB_ROOTDIR="/opt/www/iRedAdmin-1.8.1"
+IREDADMIN_WEB_ROOTDIR="/opt/www/iRedAdmin-2.2"
 IREDADMIN_WEB_ROOTDIR_SYMLINK="/opt/www/iredadmin"
 
 IREDADMIN_LOG_DIR="/var/log/iredadmin"

entrypoints/iredapd.sh

@@ -22,7 +22,7 @@ require_non_empty_var IREDAPD_DB_PASSWORD ${IREDAPD_DB_PASSWORD}
 create_log_dir ${IREDAPD_LOG_DIR}
 create_log_file ${IREDAPD_LOG_FILE}
 
-ln -sf ${IREDAPD_CUSTOM_CONF} /opt/iRedAPD-5.1/custom_settings.py
+ln -sf ${IREDAPD_CUSTOM_CONF} /opt/iRedAPD-5.1.2/custom_settings.py
 
 # Update placeholders in config file.
 ${CMD_SED} "s#PH_HOSTNAME#${HOSTNAME}#g" ${IREDAPD_CONF}

scripts/install_all_pkgs.sh

@@ -69,12 +69,12 @@ apt-get clean && apt-get autoclean && rm -rf /var/lib/apt/lists/*
 mkdir -p ${WEB_APP_ROOTDIR}
 
 # Install iRedAPD.
-wget -c -q https://github.com/iredmail/iRedAPD/archive/5.1.tar.gz && \
-tar xzf 5.1.tar.gz -C /opt && \
-rm -f 5.1.tar.gz && \
-ln -s /opt/iRedAPD-5.1 /opt/iredapd && \
-chown -R iredapd:iredapd /opt/iRedAPD-5.1 && \
-chmod -R 0500 /opt/iRedAPD-5.1 && \
+wget -c -q https://github.com/iredmail/iRedAPD/archive/5.1.2.tar.gz && \
+tar xzf 5.1.2.tar.gz -C /opt && \
+rm -f 5.1.2.tar.gz && \
+ln -s /opt/iRedAPD-5.1.2 /opt/iredapd && \
+chown -R iredapd:iredapd /opt/iRedAPD-5.1.2 && \
+chmod -R 0500 /opt/iRedAPD-5.1.2 && \
 
 # Install mlmmjadmin.
 wget -c -q https://github.com/iredmail/mlmmjadmin/archive/3.1.5.tar.gz && \
@@ -97,9 +97,9 @@ chown -R www-data:www-data temp logs && \
 chmod 0000 CHANGELOG INSTALL LICENSE README* UPGRADING installer SQL
 
 # Install iRedAdmin (open source edition).
-wget -c -q https://github.com/iredmail/iRedAdmin/archive/1.8.1.tar.gz && \
-tar xzf 1.8.1.tar.gz -C /opt/www && \
-rm -f 1.8.1.tar.gz && \
-ln -s /opt/www/iRedAdmin-1.8.1 /opt/www/iredadmin && \
-chown -R iredadmin:iredadmin /opt/www/iRedAdmin-1.8.1 && \
-chmod -R 0555 /opt/www/iRedAdmin-1.8.1
+wget -c -q https://github.com/iredmail/iRedAdmin/archive/2.2.tar.gz && \
+tar xzf 2.2.tar.gz -C /opt/www && \
+rm -f 2.2.tar.gz && \
+ln -s /opt/www/iRedAdmin-2.2 /opt/www/iredadmin && \
+chown -R iredadmin:iredadmin /opt/www/iRedAdmin-2.2 && \
+chmod -R 0555 /opt/www/iRedAdmin-2.2