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

feature: enable cloudlinux reseller limits

Browse Source
This commit is contained in:
Usman Nasir
2020-12-16 20:24:01 +05:00
parent ab05f37356
commit 46ea3766aa
2 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
CLScript/CloudLinuxResellers.py
View File

@@ -23,17 +23,26 @@ class CloudLinuxResellers(CLMain):
self.name = name self.name = name
def listAll(self, owner=None): def listAll(self, owner=None):
import pwd
users = [] users = []
acl = ACL.objects.get(name='reseller') acl = ACL.objects.get(name='reseller')
from plogical.vhost import vhost
for items in Administrator.objects.filter(acl=acl): for items in Administrator.objects.filter(acl=acl):
if self.name != None: if self.name != None:
if self.name != items.userName: if self.name != items.userName:
continue continue
try:
uid = pwd.getpwnam(items.userName).pw_uid
except:
vhost.addUser(items.userName, '/home/%s' % (items.userName))
uid = pwd.getpwnam(items.userName).pw_uid
user = {'name': items.userName, user = {'name': items.userName,
"locale_code": "EN_us", "locale_code": "EN_us",
"email": items.email, "email": items.email,
"id": None "id": uid
} }
users.append(user) users.append(user)

6
CLScript/CloudLinuxUsers.py
View File

@@ -81,7 +81,7 @@ class CloudLinuxUsers(CLMain):
for webs in websites: for webs in websites:
try: try:
itemPackage = webs.package itemPackage = webs.package
package = {'name': itemPackage.packageName, 'owner': webs.externalApp} package = {'name': itemPackage.packageName, 'owner': webs.admin.userName}
user = {} user = {}
@@ -92,7 +92,7 @@ class CloudLinuxUsers(CLMain):
user['username'] = webs.externalApp user['username'] = webs.externalApp
if self.ow: if self.ow:
user['owner'] = webs.externalApp user['owner'] = webs.admin.userName
if self.domain: if self.domain:
user['domain'] = webs.domain user['domain'] = webs.domain
@@ -133,7 +133,7 @@ class CloudLinuxUsers(CLMain):
if self.owner == None: if self.owner == None:
websites = Websites.objects.all() websites = Websites.objects.all()
else: else:
websites = Websites.objects.filter(externalApp=self.owner) websites = Websites.objects.filter(admin__userName=self.owner)
if self.username != None: if self.username != None:
websites = websites.filter(externalApp=self.username) websites = websites.filter(externalApp=self.username)