Nemcio/CyberPanel
1
0
Fork 0
mirror of https://github.com/usmannasir/cyberpanel.git synced 2025-11-08 06:16:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

bug fix: CLScripts

Browse Source
This commit is contained in:
Usman Nasir
2019-12-31 19:55:29 +05:00
parent 457c5c1e62
commit 79eb936195
12 changed files with 76 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CLScript/CloudLinuxAdmins.py
View File

@@ -11,7 +11,6 @@ except:
pass
from loginSystem.models import Administrator, ACL
import argparse
import pwd
import json
from CLScript.CLMain import CLMain

25
CLScript/CloudLinuxDB.py Executable file
View File

@@ -0,0 +1,25 @@
#!/usr/local/CyberCP/bin/python
import sys
sys.path.append('/usr/local/CyberCP')
import json
from CLScript.CLMain import CLMain
class PanelInfo(CLMain):
def __init__(self):
CLMain.__init__(self)
def emit(self):
initial = {
"mysql": None
}
final = {'data': initial, 'metadata': self.initialMeta}
print(json.dumps(final))
if __name__ == '__main__':
pi = PanelInfo()
pi.emit()

2
CLScript/CloudLinuxDomains.py
View File

@@ -9,7 +9,7 @@ try:
django.setup()
except:
pass
from websiteFunctions.models import Websites, ChildDomains
from websiteFunctions.models import Websites
import argparse
import json
from CLScript.CLMain import CLMain

8
CLScript/CloudLinuxPackages.py
View File

@@ -9,9 +9,7 @@ try:
except:
pass
from websiteFunctions.models import Websites
from CLManager.CLPackages import CLPackages
import argparse
import pwd
import json
from CLScript.CLMain import CLMain
@@ -27,16 +25,14 @@ class CloudLinuxPackages(CLMain):
for items in Websites.objects.all():
itemPackage = items.package
try:
clPackage = CLPackages.objects.get(owner=itemPackage)
packages.append({'name': clPackage.name, 'owner': items.externalApp})
packages.append({'name': itemPackage.packageName, 'owner': items.externalApp})
except:
pass
else:
for items in Websites.objects.filter(externalApp=owner):
itemPackage = items.package
try:
clPackage = CLPackages.objects.get(owner=itemPackage)
packages.append({'name': clPackage.name, 'owner': items.externalApp})
packages.append({'name': itemPackage.packageName, 'owner': items.externalApp})
except:
pass

1
CLScript/CloudLinuxResellers.py
View File

@@ -11,7 +11,6 @@ except:
pass
from loginSystem.models import Administrator, ACL
import argparse
import pwd
import json
from CLScript.CLMain import CLMain

9
CLScript/CloudLinuxUsers.py
View File

@@ -10,7 +10,6 @@ try:
except:
pass
from websiteFunctions.models import Websites
from CLManager.CLPackages import CLPackages
import argparse
import pwd
import json
@@ -27,7 +26,10 @@ class CloudLinuxUsers(CLMain):
self.packageName = packageName
self.packageOwner = packageOwner
self.fields = fields
if uid!=None:
self.uid = int(uid)
else:
self.uid = uid
if self.fields == None:
self.id = 1
@@ -78,8 +80,7 @@ class CloudLinuxUsers(CLMain):
users = []
for webs in websites:
itemPackage = webs.package
clPackage = CLPackages.objects.get(owner=itemPackage)
package = {'name': clPackage.name, 'owner': webs.externalApp}
package = {'name': itemPackage.packageName, 'owner': webs.externalApp}
user = {}
@@ -124,7 +125,7 @@ class CloudLinuxUsers(CLMain):
final = {'data': users, 'metadata': self.initialMeta}
print(json.dumps(final))
def listAll(self, owner=None, username = None):
def listAll(self):
if self.owner == None:
websites = Websites.objects.all()

22
CLScript/UserInfo.py Executable file
View File

@@ -0,0 +1,22 @@
#!/usr/local/CyberCP/bin/python
import getpass
def main():
if getpass.getuser() == 'root':
userType = "admin"
else:
userType = "user"
data = """{
"userName": "%s",
"userType": "%s",
"lang": "en",
"assetsUri": "/usr/local/lvemanager",
"baseUri": "/usr/local/lvemanager",
"defaultDomain": "cyberpanel.net"
}""" % (getpass.getuser(), userType)
print(data)
if __name__ == '__main__':
main()

8
install/install.py
View File

@@ -651,7 +651,8 @@ class preFlightsChecks:
clScripts = ['/usr/local/CyberCP/CLScript/panel_info.py', '/usr/local/CyberCP/CLScript/CloudLinuxPackages.py',
'/usr/local/CyberCP/CLScript/CloudLinuxUsers.py',
'/usr/local/CyberCP/CLScript/CloudLinuxDomains.py'
, '/usr/local/CyberCP/CLScript/CloudLinuxResellers.py', '/usr/local/CyberCP/CLScript/CloudLinuxAdmins.py']
, '/usr/local/CyberCP/CLScript/CloudLinuxResellers.py', '/usr/local/CyberCP/CLScript/CloudLinuxAdmins.py',
'/usr/local/CyberCP/CLScript/CloudLinuxDB.py', '/usr/local/CyberCP/CLScript/UserInfo.py']
for items in clScripts:
command = 'chmod +x %s' % (items)
@@ -2149,10 +2150,11 @@ users = /usr/local/CyberCP/CLScript/CloudLinuxUsers.py
domains = /usr/local/CyberCP/CLScript/CloudLinuxDomains.py
resellers = /usr/local/CyberCP/CLScript/CloudLinuxResellers.py
admins = /usr/local/CyberCP/CLScript/CloudLinuxAdmins.py
db_info = /usr/local/CyberCP/CLScript/CloudLinuxDB.py
[lvemanager_config]
ui_user_info =/usr/local/CyberCP/CLScript/UserInfo.py
base_path = /usr/local/lvemanager
run_service = 1
service_port = 9000
"""

9
plogical/adminPass.py
View File

@@ -43,15 +43,6 @@ def main():
print("Admin password successfully changed!")
return 1
## CL Package Creation
package = Package.objects.get(packageName='Default')
if CLPackages.objects.count() == 0:
clPackage = CLPackages(name='Default', owner=package, speed='100%', vmem='1G', pmem='1G', io='1024',
iops='1024', ep='20', nproc='50', inodessoft='20', inodeshard='20')
clPackage.save()
token = hashPassword.generateToken('admin', adminPass)
admin = Administrator.objects.get(userName="admin")
admin.password = hashPassword.hash_password(adminPass)

6
plogical/upgrade.py
View File

@@ -1725,7 +1725,8 @@ CSRF_COOKIE_SECURE = True
clScripts = ['/usr/local/CyberCP/CLScript/panel_info.py', '/usr/local/CyberCP/CLScript/CloudLinuxPackages.py',
'/usr/local/CyberCP/CLScript/CloudLinuxUsers.py', '/usr/local/CyberCP/CLScript/CloudLinuxDomains.py'
,'/usr/local/CyberCP/CLScript/CloudLinuxResellers.py', '/usr/local/CyberCP/CLScript/CloudLinuxAdmins.py']
,'/usr/local/CyberCP/CLScript/CloudLinuxResellers.py', '/usr/local/CyberCP/CLScript/CloudLinuxAdmins.py',
'/usr/local/CyberCP/CLScript/CloudLinuxDB.py', '/usr/local/CyberCP/CLScript/UserInfo.py']
for items in clScripts:
command = 'chmod +x %s' % (items)
@@ -2074,8 +2075,11 @@ users = /usr/local/CyberCP/CLScript/CloudLinuxUsers.py
domains = /usr/local/CyberCP/CLScript/CloudLinuxDomains.py
resellers = /usr/local/CyberCP/CLScript/CloudLinuxResellers.py
admins = /usr/local/CyberCP/CLScript/CloudLinuxAdmins.py
db_info = /usr/local/CyberCP/CLScript/CloudLinuxDB.py
[lvemanager_config]
ui_user_info = /usr/local/CyberCP/CLScript/UserInfo.py
base_path = /usr/local/lvemanager
run_service = 1
service_port = 9000
"""

5
plogical/vhost.py
View File

@@ -326,10 +326,7 @@ class vhost:
delWebsite = Websites.objects.get(domain=virtualHostName)
## Cagefs
command = '/usr/sbin/cagefsctl --disable %s' % (delWebsite.externalApp)
ProcessUtilities.normalExecutioner(command)
##
databases = Databases.objects.filter(website=delWebsite)

15
plogical/virtualHostUtilities.py
View File

@@ -216,17 +216,20 @@ class virtualHostUtilities:
if dkimCheck == 1:
DNS.createDKIMRecords(virtualHostName)
cageFSPath = '/home/cyberpanel/cagefs'
# cageFSPath = '/home/cyberpanel/cagefs'
#
# if os.path.exists(cageFSPath):
# command = '/usr/sbin/cagefsctl --enable %s' % (virtualHostUser)
# ProcessUtilities.normalExecutioner(command)
if os.path.exists(cageFSPath):
command = '/usr/sbin/cagefsctl --enable %s' % (virtualHostUser)
ProcessUtilities.normalExecutioner(command)
logging.CyberCPLogFileWriter.statusWriter(tempStatusPath, 'Website successfully created. [200]')
CLPath = '/etc/sysconfig/cloudlinux'
if os.path.exists(CLPath):
virtualHostUtilities.EnableCloudLinux()
command = '/usr/share/cloudlinux/hooks/post_modify_user.py create --username %s --owner %s' % (virtualHostUser, virtualHostUser)
ProcessUtilities.executioner(command)
logging.CyberCPLogFileWriter.statusWriter(tempStatusPath, 'Website successfully created. [200]')
return 1, 'None'