Skip to content

Commit

Permalink
Drop support for Debian 9 (stretch).
Browse files Browse the repository at this point in the history
  • Loading branch information
iredmail committed Dec 25, 2020
1 parent 9d09543 commit ef08825
Show file tree
Hide file tree
Showing 8 changed files with 14 additions and 25 deletions.
3 changes: 3 additions & 0 deletions ChangeLog
@@ -1,4 +1,7 @@
iRedMail-1.4:
* DROPPED distribution release:
- Debian 9 (stretch). Please use Debian 10 instead.

* Fixed issues:
- Fail2ban can not store banned IP address when its country name
contains quotes.
Expand Down
4 changes: 2 additions & 2 deletions conf/dovecot
Expand Up @@ -79,8 +79,8 @@ if [ X"${DISTRO}" == X'RHEL' ]; then
elif [ X"${DISTRO}" == X'DEBIAN' -o X"${DISTRO}" == X'UBUNTU' ]; then
export DOVECOT_DELIVER_BIN='/usr/lib/dovecot/deliver'

# Debian 9, Ubuntu 18.04.
if [ X"${DISTRO_CODENAME}" == X'stretch' -o X"${DISTRO_CODENAME}" == X'bionic' ]; then
# Ubuntu 18.04.
if [ X"${DISTRO_CODENAME}" == X'bionic' ]; then
export DOVECOT_VERSION='2.2'
fi
elif [ X"${DISTRO}" == X'FREEBSD' ]; then
Expand Down
14 changes: 4 additions & 10 deletions conf/global
Expand Up @@ -236,7 +236,7 @@ export UNSUPPORTED_RELEASE='NO'
if [ X"${KERNEL_NAME}" == X'LINUX' ]; then
export DISTRO_VERSION=$(awk -F'"' '/^VERSION_ID=/ {print $2}' /etc/os-release)

# Debian: 9: stretch, 10: buster
# Debian: 10: buster
# Ubuntu: 18.04: bionic, 20.04: focal
export DISTRO_CODENAME=$(awk -F'=' '/^VERSION_CODENAME=/ {print $2}' /etc/os-release)

Expand Down Expand Up @@ -478,15 +478,9 @@ elif [ X"${DISTRO}" == X'DEBIAN' -o X"${DISTRO}" == X'UBUNTU' ]; then
# Directory /etc/default/ on Debian/Ubuntu.
export ETC_SYSCONFIG_DIR='/etc/default'

# iptables rule file.
export FIREWALL_RULE_CONF="${ETC_SYSCONFIG_DIR}/iptables"
export FIREWALL_RULE_CONF6="${ETC_SYSCONFIG_DIR}/ip6tables"

if [ X"${DISTRO_CODENAME}" == X'buster' ]; then
export USE_NFTABLES='YES'
export NFTABLES_CONF='/etc/nftables.conf'
export FIREWALL_RULE_CONF="${NFTABLES_CONF}"
fi
export USE_NFTABLES='YES'
export NFTABLES_CONF='/etc/nftables.conf'
export FIREWALL_RULE_CONF="${NFTABLES_CONF}"

# Directory used to store SSL/TLS key/cert file.
export SSL_FILE_DIR="/etc/ssl"
Expand Down
5 changes: 1 addition & 4 deletions conf/php
Expand Up @@ -41,10 +41,7 @@ if [ X"${DISTRO}" == X'RHEL' ]; then
export PHP_FPM_PID_FILE='/run/php-fpm/php-fpm.pid'

elif [ X"${DISTRO}" == X'DEBIAN' -o X"${DISTRO}" == X'UBUNTU' ]; then
if [ X"${DISTRO_CODENAME}" == X'stretch' ]; then
# Debian 9
export PHP_VERSION='7.0'
elif [ X"${DISTRO_CODENAME}" == X'buster' ]; then
if [ X"${DISTRO_CODENAME}" == X'buster' ]; then
# Debian 10
export PHP_VERSION='7.3'
elif [ X"${DISTRO_CODENAME}" == X'bionic' ]; then
Expand Down
5 changes: 1 addition & 4 deletions conf/postgresql
Expand Up @@ -39,10 +39,7 @@ if [ X"${DISTRO}" == X'RHEL' ]; then
export PGSQL_CONF_PG_HBA="${PGSQL_DATA_DIR}/pg_hba.conf"

elif [ X"${DISTRO}" == X'DEBIAN' -o X"${DISTRO}" == X'UBUNTU' ]; then
if [ X"${DISTRO_CODENAME}" == X'stretch' ]; then
# Debian 9
export PGSQL_VERSION='9.6'
elif [ X"${DISTRO_CODENAME}" == X'bionic' ]; then
if [ X"${DISTRO_CODENAME}" == X'bionic' ]; then
# Ubuntu 18.04
export PGSQL_VERSION='10'
elif [ X"${DISTRO_CODENAME}" == X'buster' ]; then
Expand Down
3 changes: 1 addition & 2 deletions functions/clamav.sh
Expand Up @@ -57,8 +57,7 @@ clamav_config()

# Enable AllowSupplementaryGroups
perl -pi -e 's/^(AllowSupplementaryGroups.*)/#${1}/' ${CLAMD_CONF}
if [ X"${DISTRO_CODENAME}" != X'stretch' \
-a X"${DISTRO_CODENAME}" != X'bionic' \
if [ X"${DISTRO_CODENAME}" != X'bionic' \
-a X"${DISTRO_CODENAME}" != X'disco' \
-a X"${DISTRO}" != X'FREEBSD' ]; then
echo 'AllowSupplementaryGroups true' >> ${CLAMD_CONF}
Expand Down
3 changes: 1 addition & 2 deletions functions/dovecot.sh
Expand Up @@ -176,8 +176,7 @@ dovecot_config()
perl -pi -e 's#PH_SSL_CIPHERS#$ENV{SSL_CIPHERS}#' ${DOVECOT_CONF}

# Distros ships newer openssl which doesn't support SSLv2 anymore.
if [ X"${DISTRO}" == X'DEBIAN' -a X"${DISTRO_CODENAME}" == X'stretch' ] \
|| [ X"${DISTRO}" == X'UBUNTU' -a X"${DISTRO_CODENAME}" == X'bionic' ] \
if [ X"${DISTRO}" == X'UBUNTU' -a X"${DISTRO_CODENAME}" == X'bionic' ] \
|| [ X"${DISTRO}" == X'RHEL' -a X"${DISTRO_VERSION}" == X'8' ]; then
perl -pi -e 's#^(ssl_protocols).*#ssl_protocols = !SSLv3#' ${DOVECOT_CONF}
fi
Expand Down
2 changes: 1 addition & 1 deletion functions/packages.sh
Expand Up @@ -364,7 +364,7 @@ install_all()
[[ X"${DISTRO_VERSION}" == X'7' ]] && ALL_PKGS="${ALL_PKGS} php-pear-Net-IDNA2"
elif [ X"${DISTRO}" == X'DEBIAN' -o X"${DISTRO}" == X'UBUNTU' ]; then
if [ X"${BACKEND}" == X'OPENLDAP' ]; then
if [ X"${DISTRO_CODENAME}" == X"bionic" -o X"${DISTRO_CODENAME}" == X"stretch" ]; then
if [ X"${DISTRO_CODENAME}" == X"bionic" ]; then
ALL_PKGS="${ALL_PKGS} php-net-ldap3"
else
ALL_PKGS="${ALL_PKGS} php-ldap"
Expand Down

0 comments on commit ef08825

Please sign in to comment.