diff --git a/cyberpanel_utility.sh b/cyberpanel_utility.sh index c30de9fb1..2dcb7531f 100644 --- a/cyberpanel_utility.sh +++ b/cyberpanel_utility.sh @@ -430,7 +430,7 @@ sudo_check() { echo -e "\nYou must use root user to use CyberPanel Utility..." exit else - echo -e "\nYou are runing as root..." + echo -e "\nYou are running as root..." fi } diff --git a/install/litespeed/conf/httpd_config.conf b/install/litespeed/conf/httpd_config.conf index 74c4402e3..8b65fc2d1 100755 --- a/install/litespeed/conf/httpd_config.conf +++ b/install/litespeed/conf/httpd_config.conf @@ -163,6 +163,11 @@ listener Default{ map Example * } +listener Default IPv6{ + address [ANY]:80 + secure 0 + map Example * +} vhTemplate centralConfigLog { diff --git a/plogical/sslUtilities.py b/plogical/sslUtilities.py index bef0fcff1..81bfb31c8 100755 --- a/plogical/sslUtilities.py +++ b/plogical/sslUtilities.py @@ -52,6 +52,20 @@ class sslUtilities: logging.CyberCPLogFileWriter.writeToFile(str(msg) + " [IO Error with main config file [checkSSLListener]]") return str(msg) return 0 + + + @staticmethod + def checkSSLIPv6Listener(): + try: + data = open("/usr/local/lsws/conf/httpd_config.conf").readlines() + for items in data: + if items.find("listener SSL IPv6") > -1: + return 1 + + except BaseException as msg: + logging.CyberCPLogFileWriter.writeToFile(str(msg) + " [IO Error with main config file [checkSSLIPv6Listener]]") + return str(msg) + return 0 @staticmethod def getDNSRecords(virtualHostName): @@ -120,6 +134,45 @@ class sslUtilities: writeDataToFile.writelines("\n") writeDataToFile.close() + elif sslUtilities.checkSSLIPv6Listener() != 1: + + writeDataToFile = open("/usr/local/lsws/conf/httpd_config.conf", 'a') + + listener = "listener SSL IPv6 {" + "\n" + address = " address [ANY]:443" + "\n" + secure = " secure 1" + "\n" + keyFile = " keyFile /etc/letsencrypt/live/" + virtualHostName + "/privkey.pem\n" + certFile = " certFile /etc/letsencrypt/live/" + virtualHostName + "/fullchain.pem\n" + certChain = " certChain 1" + "\n" + sslProtocol = " sslProtocol 24" + "\n" + enableECDHE = " enableECDHE 1" + "\n" + renegProtection = " renegProtection 1" + "\n" + sslSessionCache = " sslSessionCache 1" + "\n" + enableSpdy = " enableSpdy 15" + "\n" + enableStapling = " enableStapling 1" + "\n" + ocspRespMaxAge = " ocspRespMaxAge 86400" + "\n" + map = " map " + virtualHostName + " " + virtualHostName + "\n" + final = "}" + "\n" + "\n" + + writeDataToFile.writelines("\n") + writeDataToFile.writelines(listener) + writeDataToFile.writelines(address) + writeDataToFile.writelines(secure) + writeDataToFile.writelines(keyFile) + writeDataToFile.writelines(certFile) + writeDataToFile.writelines(certChain) + writeDataToFile.writelines(sslProtocol) + writeDataToFile.writelines(enableECDHE) + writeDataToFile.writelines(renegProtection) + writeDataToFile.writelines(sslSessionCache) + writeDataToFile.writelines(enableSpdy) + writeDataToFile.writelines(enableStapling) + writeDataToFile.writelines(ocspRespMaxAge) + writeDataToFile.writelines(map) + writeDataToFile.writelines(final) + writeDataToFile.writelines("\n") + writeDataToFile.close() + else: if sslUtilities.checkIfSSLMap(virtualHostName) == 0: diff --git a/serverStatus/litespeed/conf/httpd_config.conf b/serverStatus/litespeed/conf/httpd_config.conf index 31783e118..b684078c1 100755 --- a/serverStatus/litespeed/conf/httpd_config.conf +++ b/serverStatus/litespeed/conf/httpd_config.conf @@ -162,6 +162,11 @@ listener Default{ map Example * } +listener Default IPv6{ + address [ANY]:80 + secure 0 + map Example * +} vhTemplate centralConfigLog {