diff --git a/install/install.py b/install/install.py
index d02d06870..d7768eddb 100644
--- a/install/install.py
+++ b/install/install.py
@@ -12,7 +12,7 @@ import time
class preFlightsChecks:
- cyberPanelMirror = "mirror.cyberpanel.net"
+ cyberPanelMirror = "mirror.cyberpanel.net/pip"
def __init__(self,rootPath,ip,path,cwd,cyberPanelPath):
self.ipAddr = ip
@@ -334,19 +334,97 @@ class preFlightsChecks:
def install_python_requests(self):
try:
import requests
- except:
+
+ ## Un-install ULRLIB3 and requests
+
+ command = "pip uninstall --yes urllib3"
+ res = subprocess.call(shlex.split(command))
+
+ command = "pip uninstall --yes requests"
+ res = subprocess.call(shlex.split(command))
+
+
+ ## Install specific versions
+
count = 0
while (1):
- command = "pip install requests"
+ command = "pip install http://"+preFlightsChecks.cyberPanelMirror+"/urllib3-1.22.tar.gz"
res = subprocess.call(shlex.split(command))
if res == 1:
count = count + 1
- preFlightsChecks.stdOut("Unable to install requests module, trying again, try number: " + str(count))
+ preFlightsChecks.stdOut(
+ "Unable to install urllib3 module, trying again, try number: " + str(count))
if count == 3:
- logging.InstallLog.writeToFile("Unable to install requests module, exiting installer! [install_python_requests]")
+ logging.InstallLog.writeToFile(
+ "Unable to install urllib3 module, exiting installer! [install_python_requests]")
+ preFlightsChecks.stdOut("Installation failed, consult: /var/log/installLogs.txt")
+ sys.exit()
+ else:
+ logging.InstallLog.writeToFile("urllib3 module Successfully installed!")
+ preFlightsChecks.stdOut("urllib3 module Successfully installed!")
+ break
+
+ count = 0
+ while (1):
+
+ command = "pip install http://"+preFlightsChecks.cyberPanelMirror+"/requests-2.18.4.tar.gz"
+
+ res = subprocess.call(shlex.split(command))
+
+ if res == 1:
+ count = count + 1
+ preFlightsChecks.stdOut(
+ "Unable to install requests module, trying again, try number: " + str(count))
+ if count == 3:
+ logging.InstallLog.writeToFile(
+ "Unable to install requests module, exiting installer! [install_python_requests]")
+ preFlightsChecks.stdOut("Installation failed, consult: /var/log/installLogs.txt")
+ sys.exit()
+ else:
+ logging.InstallLog.writeToFile("Requests module Successfully installed!")
+ preFlightsChecks.stdOut("Requests module Successfully installed!")
+ break
+
+ except:
+
+ count = 0
+ while (1):
+
+ command = "pip install http://"+preFlightsChecks.cyberPanelMirror+"/urllib3-1.22.tar.gz"
+
+ res = subprocess.call(shlex.split(command))
+
+ if res == 1:
+ count = count + 1
+ preFlightsChecks.stdOut(
+ "Unable to install urllib3 module, trying again, try number: " + str(count))
+ if count == 3:
+ logging.InstallLog.writeToFile(
+ "Unable to install urllib3 module, exiting installer! [install_python_requests]")
+ preFlightsChecks.stdOut("Installation failed, consult: /var/log/installLogs.txt")
+ sys.exit()
+ else:
+ logging.InstallLog.writeToFile("urllib3 module Successfully installed!")
+ preFlightsChecks.stdOut("urllib3 module Successfully installed!")
+ break
+
+ count = 0
+ while (1):
+
+ command = "pip install http://"+preFlightsChecks.cyberPanelMirror+"/requests-2.18.4.tar.gz"
+
+ res = subprocess.call(shlex.split(command))
+
+ if res == 1:
+ count = count + 1
+ preFlightsChecks.stdOut(
+ "Unable to install requests module, trying again, try number: " + str(count))
+ if count == 3:
+ logging.InstallLog.writeToFile(
+ "Unable to install requests module, exiting installer! [install_python_requests]")
preFlightsChecks.stdOut("Installation failed, consult: /var/log/installLogs.txt")
sys.exit()
else:
@@ -357,10 +435,33 @@ class preFlightsChecks:
def install_pexpect(self):
try:
import pexpect
+
+ command = "pip uninstall --yes pexpect"
+ res = subprocess.call(shlex.split(command))
+
+ count = 0
+
+ while (1):
+ command = "pip install http://"+preFlightsChecks.cyberPanelMirror+"/pexpect-4.4.0.tar.gz"
+
+ res = subprocess.call(shlex.split(command))
+
+ if res == 1:
+ count = count + 1
+ preFlightsChecks.stdOut("Unable to install pexpect, trying again, try number: " + str(count))
+ if count == 3:
+ logging.InstallLog.writeToFile("Unable to install pexpect, exiting installer! [install_pexpect]")
+ preFlightsChecks.stdOut("Installation failed, consult: /var/log/installLogs.txt")
+ sys.exit()
+ else:
+ logging.InstallLog.writeToFile("pexpect successfully installed!")
+ preFlightsChecks.stdOut("pexpect successfully installed!")
+ break
+
except:
count = 0
while (1):
- command = "pip install pexpect"
+ command = "pip install http://"+preFlightsChecks.cyberPanelMirror+"/pexpect-4.4.0.tar.gz"
res = subprocess.call(shlex.split(command))
@@ -497,10 +598,33 @@ class preFlightsChecks:
try:
import psutil
+
+ ##
+
+ command = "pip uninstall --yes psutil"
+ res = subprocess.call(shlex.split(command))
+
+ count = 0
+ while (1):
+ command = "pip install http://"+preFlightsChecks.cyberPanelMirror+"/psutil-5.4.3.tar.gz"
+ res = subprocess.call(shlex.split(command))
+
+ if res == 1:
+ count = count + 1
+ preFlightsChecks.stdOut("Unable to install psutil, trying again, try number: " + str(count))
+ if count == 3:
+ logging.InstallLog.writeToFile("Unable to install psutil, exiting installer! [install_psutil]")
+ preFlightsChecks.stdOut("Installation failed, consult: /var/log/installLogs.txt")
+ sys.exit()
+ else:
+ logging.InstallLog.writeToFile("psutil successfully installed!")
+ preFlightsChecks.stdOut("psutil successfully installed!")
+ break
+
except:
count = 0
while (1):
- command = "easy_install psutil"
+ command = "pip install http://"+preFlightsChecks.cyberPanelMirror+"/psutil-5.4.3.tar.gz"
res = subprocess.call(shlex.split(command))
if res == 1:
@@ -2237,19 +2361,53 @@ class preFlightsChecks:
latest = getVersion.json()
except BaseException,msg:
+ command = "pip uninstall --yes urllib3"
+ subprocess.call(shlex.split(command))
+
command = "pip uninstall --yes requests"
subprocess.call(shlex.split(command))
- command = "pip install requests==2.2.1"
- res = subprocess.call(shlex.split(command))
+ count = 0
+ while (1):
- if res == 1:
- logging.InstallLog.writeToFile("Request test successful!")
- else:
- logging.InstallLog.writeToFile("Request test failed!")
+ command = "pip install http://mirror.cyberpanel.net/urllib3-1.22.tar.gz"
- logging.InstallLog.writeToFile(str(msg) + " [test_Requests]")
- return 0
+ res = subprocess.call(shlex.split(command))
+
+ if res == 1:
+ count = count + 1
+ preFlightsChecks.stdOut(
+ "Unable to install urllib3 module, trying again, try number: " + str(count))
+ if count == 3:
+ logging.InstallLog.writeToFile(
+ "Unable to install urllib3 module, exiting installer! [install_python_requests]")
+ preFlightsChecks.stdOut("Installation failed, consult: /var/log/installLogs.txt")
+ sys.exit()
+ else:
+ logging.InstallLog.writeToFile("urllib3 module Successfully installed!")
+ preFlightsChecks.stdOut("urllib3 module Successfully installed!")
+ break
+
+ count = 0
+ while (1):
+
+ command = "pip install http://mirror.cyberpanel.net/requests-2.18.4.tar.gz"
+
+ res = subprocess.call(shlex.split(command))
+
+ if res == 1:
+ count = count + 1
+ preFlightsChecks.stdOut(
+ "Unable to install requests module, trying again, try number: " + str(count))
+ if count == 3:
+ logging.InstallLog.writeToFile(
+ "Unable to install requests module, exiting installer! [install_python_requests]")
+ preFlightsChecks.stdOut("Installation failed, consult: /var/log/installLogs.txt")
+ sys.exit()
+ else:
+ logging.InstallLog.writeToFile("Requests module Successfully installed!")
+ preFlightsChecks.stdOut("Requests module Successfully installed!")
+ break
def installation_successfull(self):
print("###################################################################")
@@ -2268,101 +2426,51 @@ class preFlightsChecks:
def installCertBot(self):
try:
- try:
- if subprocess.check_output('systemd-detect-virt').find("openvz") > -1:
- count = 0
+ command = "pip uninstall --yes pyOpenSSL"
+ res = subprocess.call(shlex.split(command))
- while (1):
- command = "pip install pyOpenSSL==16.2.0"
- cmd = shlex.split(command)
- res = subprocess.call(cmd)
+ command = "pip uninstall --yes certbot"
+ res = subprocess.call(shlex.split(command))
- if res == 1:
- count = count + 1
- preFlightsChecks.stdOut("Trying to install CertBot prerequisites, trying again, try number: " + str(count))
- if count == 3:
- logging.InstallLog.writeToFile("Failed to install CertBot prerequisites, exiting installer! [installCertBot]")
- preFlightsChecks.stdOut("Installation failed, consult: /var/log/installLogs.txt")
- sys.exit()
- else:
- logging.InstallLog.writeToFile("CertBot prerequisites successfully installed! [pyOpenSSL==16.2.0]")
- preFlightsChecks.stdOut("CertBot prerequisites successfully installed! [pyOpenSSL==16.2.0]")
- break
+ count = 0
+ while (1):
+ command = "pip install http://" + preFlightsChecks.cyberPanelMirror + "/pyOpenSSL-17.5.0.tar.gz"
- count = 0
-
- while(1):
-
- command = "pip install certbot"
- cmd = shlex.split(command)
- res = subprocess.call(cmd)
-
- if res == 1:
- count = count + 1
- preFlightsChecks.stdOut("Trying to install CertBot, trying again, try number: " + str(count))
- if count == 3:
- logging.InstallLog.writeToFile("Failed to install CertBot, exiting installer! [installCertBot]")
- preFlightsChecks.stdOut("Installation failed, consult: /var/log/installLogs.txt")
- sys.exit()
- else:
- logging.InstallLog.writeToFile("CertBot successfully installed! [pip]")
- preFlightsChecks.stdOut("CertBot successfully installed! [pip]")
- break
+ res = subprocess.call(shlex.split(command))
+ if res == 1:
+ count = count + 1
+ preFlightsChecks.stdOut(
+ "Trying to install pyOpenSSL, trying again, try number: " + str(count))
+ if count == 3:
+ logging.InstallLog.writeToFile(
+ "Failed to install pyOpenSSL, exiting installer! [installCertBot]")
+ preFlightsChecks.stdOut("Installation failed, consult: /var/log/installLogs.txt")
+ sys.exit()
else:
+ logging.InstallLog.writeToFile("pyOpenSSL successfully installed! [pip]")
+ preFlightsChecks.stdOut("pyOpenSSL successfully installed! [pip]")
+ break
- count = 0
-
- while(1):
- cmd = []
-
- cmd.append("yum")
- cmd.append("-y")
- cmd.append("install")
- cmd.append("certbot")
-
- res = subprocess.call(cmd)
-
- if res == 1:
- count = count + 1
- preFlightsChecks.stdOut("Trying to install CertBot, trying again, try number: " + str(count))
- if count == 3:
- logging.InstallLog.writeToFile("Failed to install CertBot, exiting installer! [installCertBot]")
- preFlightsChecks.stdOut("Installation failed, consult: /var/log/installLogs.txt")
- sys.exit()
- else:
- logging.InstallLog.writeToFile("CertBot successfully installed! [yum]")
- preFlightsChecks.stdOut("CertBot successfully installed! [yum]")
- break
-
- except:
-
- count = 0
-
- while (1):
- cmd = []
- cmd.append("yum")
- cmd.append("-y")
- cmd.append("install")
- cmd.append("certbot")
-
- res = subprocess.call(cmd)
-
- if res == 1:
- count = count + 1
- preFlightsChecks.stdOut(
- "Trying to install CertBot, trying again, try number: " + str(count))
- if count == 3:
- logging.InstallLog.writeToFile(
- "Failed to install CertBot, exiting installer! [installCertBot]")
- preFlightsChecks.stdOut("Installation failed, consult: /var/log/installLogs.txt")
- sys.exit()
- else:
- logging.InstallLog.writeToFile("CertBot successfully installed! [yum]")
- preFlightsChecks.stdOut("CertBot successfully installed! [yum]")
- break
+ count = 0
+ while (1):
+ command = "pip install http://" + preFlightsChecks.cyberPanelMirror + "/certbot-0.21.1.tar.gz"
+ res = subprocess.call(shlex.split(command))
+ if res == 1:
+ count = count + 1
+ preFlightsChecks.stdOut(
+ "Trying to install CertBot, trying again, try number: " + str(count))
+ if count == 3:
+ logging.InstallLog.writeToFile(
+ "Failed to install CertBot, exiting installer! [installCertBot]")
+ preFlightsChecks.stdOut("Installation failed, consult: /var/log/installLogs.txt")
+ sys.exit()
+ else:
+ logging.InstallLog.writeToFile("CertBot successfully installed! [pip]")
+ preFlightsChecks.stdOut("CertBot successfully installed! [pip]")
+ break
except OSError, msg:
logging.InstallLog.writeToFile(str(msg) + " [installCertBot]")
diff --git a/install/installCyberPanel.py b/install/installCyberPanel.py
index 66bdf8f06..d4dd4df88 100644
--- a/install/installCyberPanel.py
+++ b/install/installCyberPanel.py
@@ -259,6 +259,27 @@ class InstallCyberPanel:
InstallCyberPanel.stdOut("LiteSpeed PHP 7.1 successfully installed!")
break
+ ## only php 72
+ count = 0
+ while (1):
+ command = 'yum install -y lsphp72 lsphp72-json lsphp72-xmlrpc lsphp72-xml lsphp72-tidy lsphp72-soap lsphp72-snmp lsphp72-recode lsphp72-pspell lsphp72-process lsphp72-pgsql lsphp72-pear lsphp72-pdo lsphp72-opcache lsphp72-odbc lsphp72-mysqlnd lsphp72-mcrypt lsphp72-mbstring lsphp72-ldap lsphp72-intl lsphp72-imap lsphp72-gmp lsphp72-gd lsphp72-enchant lsphp72-dba lsphp72-common lsphp72-bcmath'
+ cmd = shlex.split(command)
+ res = subprocess.call(cmd)
+ if res == 1:
+ count = count + 1
+ InstallCyberPanel.stdOut(
+ "Trying to install LiteSpeed PHP 7.1, trying again, try number: " + str(count))
+ if count == 3:
+ logging.InstallLog.writeToFile(
+ "Failed to install LiteSpeed PHP 7.1, exiting installer! [installAllPHPVersions]")
+ InstallCyberPanel.stdOut("Installation failed, consult: /var/log/installLogs.txt")
+ sys.exit()
+ else:
+ logging.InstallLog.writeToFile("LiteSpeed PHP 7.1 successfully installed!")
+ InstallCyberPanel.stdOut("LiteSpeed PHP 7.1 successfully installed!")
+ break
+
+
## break for outer loop
break
diff --git a/userManagment/templates/userManagment/createUser.html b/userManagment/templates/userManagment/createUser.html
index 2fa7b002a..4b1e10944 100644
--- a/userManagment/templates/userManagment/createUser.html
+++ b/userManagment/templates/userManagment/createUser.html
@@ -64,8 +64,8 @@
@@ -76,7 +76,7 @@
diff --git a/userManagment/views.py b/userManagment/views.py
index 8ea2440e9..0f2fb73d2 100644
--- a/userManagment/views.py
+++ b/userManagment/views.py
@@ -160,7 +160,7 @@ def submitUserCreation(request):
return HttpResponse(final_json)
else:
websitesLimit = data['websitesLimit']
- userAccountsLimit = data['userAccountsLimit']
+ userAccountsLimit = 0
newAdmin = Administrator(firstName=firstName,
lastName=lastName,
@@ -310,8 +310,8 @@ def saveModifications(request):
if data['accountType'] == "Reseller":
- userAccountsLimit = data['userAccountsLimit']
- websitesLimit = data['websitesLimit']
+ userAccountsLimit = 0
+ websitesLimit = 0
user.firstName = firstName
user.lastName = lastName
diff --git a/websiteFunctions/static/websiteFunctions/websiteFunctions.js b/websiteFunctions/static/websiteFunctions/websiteFunctions.js
index 159e19277..fef3fe37a 100644
--- a/websiteFunctions/static/websiteFunctions/websiteFunctions.js
+++ b/websiteFunctions/static/websiteFunctions/websiteFunctions.js
@@ -13,7 +13,7 @@ app.controller('createWebsite', function($scope,$http) {
$scope.createWebsite = function(){
- if ($scope.sslCheck == true){
+ if ($scope.sslCheck === true){
var ssl = 1;
}
else{
diff --git a/websiteFunctions/views.py b/websiteFunctions/views.py
index 48a276c26..3e9cd3a88 100644
--- a/websiteFunctions/views.py
+++ b/websiteFunctions/views.py
@@ -217,6 +217,7 @@ def submitWebsiteCreation(request):
if request.method == 'POST':
data = json.loads(request.body)
+
domain = data['domainName']
adminEmail = data['adminEmail']
phpSelection = data['phpSelection']