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

Fix for Ubuntu 16.04 due to Python Path Bug Being Backported All the Way to 16

Browse source
This commit is contained in:
earnolmartin 2020-10-26 10:17:58 -06:00
parent 860d582944
commit 42edfd39a6
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ehcp/ehcpforceupdate.sh
View file

@ -2625,14 +2625,14 @@ function installPythonPamMysql(){
# Copy our libpam-python scripts to /etc/security
cp -vf /var/www/new/ehcp/etc/pam/pam_dbauth_smtp.conf /etc/security/pam_dbauth_smtp.conf
if [[ "$distro" == "ubuntu" && "$yrelease" -ge "18" ]]; then
if [[ "$distro" == "ubuntu" && "$yrelease" -ge "16" ]]; then
cp -vf /var/www/new/ehcp/etc/pam/pam_dbauth_smtp_ubuntu_20_plus.py /etc/security/pam_dbauth_smtp.py
else
cp -vf /var/www/new/ehcp/etc/pam/pam_dbauth_smtp.py /etc/security/pam_dbauth_smtp.py
fi
cp -vf /var/www/new/ehcp/etc/pam/pam_dbauth_vsftpd.conf /etc/security/pam_dbauth_vsftpd.conf
if [[ "$distro" == "ubuntu" && "$yrelease" -ge "18" ]]; then
if [[ "$distro" == "ubuntu" && "$yrelease" -ge "16" ]]; then
cp -vf /var/www/new/ehcp/etc/pam/pam_dbauth_vsftpd_ubuntu_20_plus.py /etc/security/pam_dbauth_vsftpd.py
else
cp -vf /var/www/new/ehcp/etc/pam/pam_dbauth_vsftpd.py /etc/security/pam_dbauth_vsftpd.py

4
ehcp/install_lib.php
View file

@ -1197,14 +1197,14 @@ function installPythonPamMysql(){
// Copy our libpam-python scripts to /etc/security
passthru2("cp -vf $ehcpinstalldir/etc/pam/pam_dbauth_smtp.conf /etc/security/pam_dbauth_smtp.conf");
if(getIsUbuntu() && getUbuntuReleaseYear() >= "18"){
if(getIsUbuntu() && getUbuntuReleaseYear() >= "16"){
passthru2("cp -vf $ehcpinstalldir/etc/pam/pam_dbauth_smtp_ubuntu_20_plus.py /etc/security/pam_dbauth_smtp.py");
}else{
passthru2("cp -vf $ehcpinstalldir/etc/pam/pam_dbauth_smtp.py /etc/security/pam_dbauth_smtp.py");
}
passthru2("cp -vf $ehcpinstalldir/etc/pam/pam_dbauth_vsftpd.conf /etc/security/pam_dbauth_vsftpd.conf");
if(getIsUbuntu() && getUbuntuReleaseYear() >= "18"){
if(getIsUbuntu() && getUbuntuReleaseYear() >= "16"){
passthru2("cp -vf $ehcpinstalldir/etc/pam/pam_dbauth_vsftpd_ubuntu_20_plus.py /etc/security/pam_dbauth_vsftpd.py");
}else{
passthru2("cp -vf $ehcpinstalldir/etc/pam/pam_dbauth_vsftpd.py /etc/security/pam_dbauth_vsftpd.py");