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

enforce disk limits

Browse Source
This commit is contained in:
Usman Nasir
2021-04-05 14:03:06 +05:00
parent 1f69f9d27e
commit 60b48d15e6
4 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
packages/packagesManager.py
View File

@@ -27,7 +27,7 @@ class PackagesManager:
userID = self.request.session['userID'] userID = self.request.session['userID']
admin = Administrator.objects.get(pk=userID) admin = Administrator.objects.get(pk=userID)
proc = httpProc(self.request, 'packages/createPackage.html', proc = httpProc(self.request, 'packages/createPackage.html',
{"admin": admin.userName}, 'createPackage') {"adminNamePackage": admin.userName}, 'createPackage')
return proc.render() return proc.render()
def deletePacakge(self): def deletePacakge(self):
@@ -66,6 +66,11 @@ class PackagesManager:
except: except:
allowFullDomain = 1 allowFullDomain = 1
try:
enforceDiskLimits = int(data['enforceDiskLimits'])
except:
enforceDiskLimits = 0
if packageSpace < 0 or packageBandwidth < 0 or packageDatabases < 0 or ftpAccounts < 0 or emails < 0 or allowedDomains < 0: if packageSpace < 0 or packageBandwidth < 0 or packageDatabases < 0 or ftpAccounts < 0 or emails < 0 or allowedDomains < 0:
data_ret = {'saveStatus': 0, 'error_message': "All values should be positive or 0."} data_ret = {'saveStatus': 0, 'error_message': "All values should be positive or 0."}
@@ -79,7 +84,7 @@ class PackagesManager:
package = Package(admin=admin, packageName=packageName, diskSpace=packageSpace, package = Package(admin=admin, packageName=packageName, diskSpace=packageSpace,
bandwidth=packageBandwidth, ftpAccounts=ftpAccounts, dataBases=packageDatabases, bandwidth=packageBandwidth, ftpAccounts=ftpAccounts, dataBases=packageDatabases,
emailAccounts=emails, allowedDomains=allowedDomains, allowFullDomain=allowFullDomain) emailAccounts=emails, allowedDomains=allowedDomains, allowFullDomain=allowFullDomain, enforceDiskLimits=enforceDiskLimits)
package.save() package.save()

2
packages/static/packages/packages.js
View File

@@ -64,7 +64,7 @@ app.controller('createPackage', function ($scope, $http) {
dataBases: dataBases, dataBases: dataBases,
emails: emails, emails: emails,
allowedDomains: $scope.allowedDomains, allowedDomains: $scope.allowedDomains,
allowFullDomain: $scope.allowFullDomain enforceDiskLimits: $scope.enforceDiskLimits
}; };
var config = { var config = {

8
packages/templates/packages/createPackage.html
View File

@@ -29,7 +29,7 @@
<input name="pname" type="text" class="form-control" ng-model="packageName" required> <input name="pname" type="text" class="form-control" ng-model="packageName" required>
</div> </div>
<div class="current-pack">{{ admin }}_{$ packageName $}</div> <div class="current-pack">{{ adminNamePackage }}_{$ packageName $}</div>
</div> </div>
<div class="form-group"> <div class="form-group">
@@ -90,6 +90,12 @@
Allow Creation of Fully Qualified Domain as Child-Domains Allow Creation of Fully Qualified Domain as Child-Domains
</label> </label>
</div> </div>
<div class="checkbox">
<label>
<input ng-model="enforceDiskLimits" type="checkbox" value="">
Enforce Disk Limits
</label>
</div>
</div> </div>
</div> </div>

2
plogical/CyberPanelUpgrade.py
View File

@@ -37,7 +37,6 @@ class UpgradeCyberPanel:
Upgrade.executioner(command, command) Upgrade.executioner(command, command)
Upgrade.fixPermissions() Upgrade.fixPermissions()
def UpgardeNow(self): def UpgardeNow(self):
from plogical.upgrade import Upgrade from plogical.upgrade import Upgrade
@@ -108,7 +107,6 @@ class UpgradeCyberPanel:
self.PostStatus('CyberPanel Upgraded/Downgraded to %s. [200]' % (self.branch)) self.PostStatus('CyberPanel Upgraded/Downgraded to %s. [200]' % (self.branch))
def main(): def main():
parser = argparse.ArgumentParser(description='CyberPanel Installer') parser = argparse.ArgumentParser(description='CyberPanel Installer')
parser.add_argument('--branch', help='Branch to install.') parser.add_argument('--branch', help='Branch to install.')