beenull/EHCP-Force-Edition
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Ubuntu 14.04 Post EOL Fixes

Browse source
This commit is contained in:
earnolmartin 2022-02-28 11:01:46 -07:00
parent 42b0970984
commit 7daac867fe
2 changed files with 84 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
ehcp/ehcpforceupdate.sh
View file

@ -963,6 +963,11 @@ function genUbuntuFixes(){
if [[ "$distro" == "ubuntu" && "$yrelease" -eq "18" && "$mrelease" == "04" ]]; then
fixQuotaForEmailsPostfix3x
fi
# Ubuntu 14.04 Fix 2022
if [[ "$distro" == "ubuntu" && "$yrelease" -eq "14" ]]; then
fixUbuntu14SSL
fi
fi
}
@ -2852,7 +2857,7 @@ function installCertBotLetsEncrypt(){
echo -e "Installing Let's Encrypt certbot-auto from their website..."
# Go download it
if [ ! -e "/usr/local/bin/certbot" ]; then
if [ ! -e "/usr/local/bin/certbot" ] || [ ! -s "/usr/local/bin/certbot" ]; then
wget -O "certbot-auto.zip" -N https://ehcpforce.tk/files/certbot.zip --no-check-certificate
unzip "certbot-auto.zip"
chmod a+x certbot-auto
@ -3377,6 +3382,42 @@ function fixEHCPAutoReplyPostfixMasterCF(){
sed -i 's/.*submission inet n - - - - smtpd.*//g' "$PostFixMaster"
}
function fixUbuntu14SSL(){
openSSLVersion=$(openssl version | grep -o "OpenSSL 1.1.1b")
if [ -z "$openSSLVersion" ]; then
# Compile openssl 1.1.1b
origDir=$(pwd)
cd "$patchDir"
wget https://www.openssl.org/source/old/1.1.1/openssl-1.1.1b.tar.gz
tar -xf openssl-1.1.1b.tar.gz
cd openssl-1.1.1b
./config --prefix=/usr/local/ssl --openssldir=/usr/local/ssl shared
make
make install
echo "/usr/local/ssl/lib" > /etc/ld.so.conf.d/openssl-1.1.1b.conf
ldconfig -v
mv /usr/bin/c_rehash /usr/bin/c_rehash.BEKUP
mv /usr/bin/openssl /usr/bin/openssl.BEKUP
ln -s /usr/local/ssl/bin/c_rehash /usr/bin/c_rehash
ln -s /usr/local/ssl/bin/openssl /usr/bin/openssl
# Update CA Certificates
cd "$patchDir"
wget https://launchpad.net/ubuntu/+archive/primary/+sourcefiles/ca-certificates/20210119~20.04.2/ca-certificates_20210119~20.04.2.tar.xz
tar -xJf ca-certificates_20210119~20.04.2.tar.xz
cd ca-certificates-20210119~20.04.1
make
sudo make install
sudo dpkg-reconfigure -fnoninteractive ca-certificates
sudo update-ca-certificates
/usr/bin/c_rehash /etc/ssl/certs
rm -rf /usr/local/ssl/certs
ln -s /etc/ssl/certs /usr/local/ssl/certs
cd $origDir
fi
}
###############################
###START OF SCRIPT MAIN CODE###
###############################

43
ehcp/install_main.sh
View file

@ -567,6 +567,11 @@ function genUbuntuFixes(){
if [[ "$distro" == "ubuntu" && "$yrelease" -eq "18" && "$mrelease" == "04" ]]; then
fixQuotaForEmailsPostfix3x
fi
# Ubuntu 14.04 Fix 2022
if [[ "$distro" == "ubuntu" && "$yrelease" -eq "14" ]]; then
fixUbuntu14SSL
fi
fi
}
@ -2494,7 +2499,7 @@ function installCertBotLetsEncrypt(){
logToInstallLogFile "Installing Let's Encrypt certbot-auto from their website..."
# Go download it
if [ ! -e "/usr/local/bin/certbot" ]; then
if [ ! -e "/usr/local/bin/certbot" ] || [ ! -s "/usr/local/bin/certbot" ]; then
wget -O "certbot-auto.zip" -N https://ehcpforce.tk/files/certbot.zip --no-check-certificate
unzip "certbot-auto.zip"
chmod a+x certbot-auto
@ -3056,6 +3061,42 @@ function preventUserCronFromWebUser(){
fi
}
function fixUbuntu14SSL(){
openSSLVersion=$(openssl version | grep -o "OpenSSL 1.1.1b")
if [ -z "$openSSLVersion" ]; then
# Compile openssl 1.1.1b
origDir=$(pwd)
cd "$patchDir"
wget https://www.openssl.org/source/old/1.1.1/openssl-1.1.1b.tar.gz
tar -xf openssl-1.1.1b.tar.gz
cd openssl-1.1.1b
./config --prefix=/usr/local/ssl --openssldir=/usr/local/ssl shared
make
make install
echo "/usr/local/ssl/lib" > /etc/ld.so.conf.d/openssl-1.1.1b.conf
ldconfig -v
mv /usr/bin/c_rehash /usr/bin/c_rehash.BEKUP
mv /usr/bin/openssl /usr/bin/openssl.BEKUP
ln -s /usr/local/ssl/bin/c_rehash /usr/bin/c_rehash
ln -s /usr/local/ssl/bin/openssl /usr/bin/openssl
# Update CA Certificates
cd "$patchDir"
wget https://launchpad.net/ubuntu/+archive/primary/+sourcefiles/ca-certificates/20210119~20.04.2/ca-certificates_20210119~20.04.2.tar.xz
tar -xJf ca-certificates_20210119~20.04.2.tar.xz
cd ca-certificates-20210119~20.04.1
make
sudo make install
sudo dpkg-reconfigure -fnoninteractive ca-certificates
sudo update-ca-certificates
/usr/bin/c_rehash /etc/ssl/certs
rm -rf /usr/local/ssl/certs
ln -s /etc/ssl/certs /usr/local/ssl/certs
cd $origDir
fi
}
#############################################################
# End Functions & Start Install #
#############################################################