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

fetch ubuntu distro correctly

Browse Source
This commit is contained in:
Usman Nasir
2020-05-15 01:07:04 +05:00
parent 52e56c3bdb
commit 9d235aa9ad
9 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
baseTemplate/views.py
View File

@@ -59,7 +59,7 @@ def getAdminStatus(request):
pdns = PDNSStatus.objects.get(pk=1) pdns = PDNSStatus.objects.get(pk=1)
currentACL['dnsAsWhole'] = pdns.serverStatus currentACL['dnsAsWhole'] = pdns.serverStatus
except: except:
if ProcessUtilities.decideDistro() == ProcessUtilities.ubuntu: if ProcessUtilities.decideDistro() == ProcessUtilities.ubuntu or ProcessUtilities.decideDistro() == ProcessUtilities.ubuntu20:
pdnsPath = '/etc/powerdns' pdnsPath = '/etc/powerdns'
else: else:
pdnsPath = '/etc/pdns' pdnsPath = '/etc/pdns'

2
plogical/applicationInstaller.py
View File

@@ -67,7 +67,7 @@ class ApplicationInstaller(multi.Thread):
f = open(ServerStatusUtil.lswsInstallStatusPath, 'a') f = open(ServerStatusUtil.lswsInstallStatusPath, 'a')
if ProcessUtilities.decideDistro() == ProcessUtilities.ubuntu: if ProcessUtilities.decideDistro() == ProcessUtilities.ubuntu or ProcessUtilities.decideDistro() == ProcessUtilities.ubuntu20:
if package == 'all': if package == 'all':
command = 'DEBIAN_FRONTEND=noninteractive apt-get update -y' command = 'DEBIAN_FRONTEND=noninteractive apt-get update -y'

4
plogical/cronUtil.py
View File

@@ -100,7 +100,7 @@ class CronUtil:
commandT = 'chmod 755 %s' % (cronParent) commandT = 'chmod 755 %s' % (cronParent)
ProcessUtilities.executioner(commandT, 'root') ProcessUtilities.executioner(commandT, 'root')
if ProcessUtilities.decideDistro() == ProcessUtilities.ubuntu: if ProcessUtilities.decideDistro() == ProcessUtilities.ubuntu or ProcessUtilities.decideDistro() == ProcessUtilities.ubuntu20:
command = 'chmod 755 /var/spool/cron/crontabs' command = 'chmod 755 /var/spool/cron/crontabs'
ProcessUtilities.outputExecutioner(command) ProcessUtilities.outputExecutioner(command)
@@ -109,7 +109,7 @@ class CronUtil:
commandT = 'chmod 700 %s' % (cronParent) commandT = 'chmod 700 %s' % (cronParent)
ProcessUtilities.executioner(commandT, 'root') ProcessUtilities.executioner(commandT, 'root')
if ProcessUtilities.decideDistro() == ProcessUtilities.ubuntu: if ProcessUtilities.decideDistro() == ProcessUtilities.ubuntu or ProcessUtilities.decideDistro() == ProcessUtilities.ubuntu20:
command = 'chmod 1730 /var/spool/cron/crontabs' command = 'chmod 1730 /var/spool/cron/crontabs'
ProcessUtilities.outputExecutioner(command) ProcessUtilities.outputExecutioner(command)

4
plogical/csf.py
View File

@@ -73,7 +73,7 @@ class CSF(multi.Thread):
if ProcessUtilities.decideDistro() == ProcessUtilities.centos: if ProcessUtilities.decideDistro() == ProcessUtilities.centos:
command = 'yum install bind-utils net-tools perl-libwww-perl.noarch perl-LWP-Protocol-https.noarch perl-GDGraph ipset -y' command = 'yum install bind-utils net-tools perl-libwww-perl.noarch perl-LWP-Protocol-https.noarch perl-GDGraph ipset -y'
ProcessUtilities.normalExecutioner(command) ProcessUtilities.normalExecutioner(command)
elif ProcessUtilities.decideDistro() == ProcessUtilities.ubuntu: elif ProcessUtilities.decideDistro() == ProcessUtilities.ubuntu or ProcessUtilities.decideDistro() == ProcessUtilities.ubuntu20:
command = 'apt-get install dnsutils libwww-perl liblwp-protocol-https-perl libgd-graph-perl net-tools ipset -y' command = 'apt-get install dnsutils libwww-perl liblwp-protocol-https-perl libgd-graph-perl net-tools ipset -y'
ProcessUtilities.normalExecutioner(command) ProcessUtilities.normalExecutioner(command)
command = 'ln -s /bin/systemctl /usr/bin/systemctl' command = 'ln -s /bin/systemctl /usr/bin/systemctl'
@@ -309,7 +309,7 @@ class CSF(multi.Thread):
## ##
# Some Ubuntu initial configurations # Some Ubuntu initial configurations
if ProcessUtilities.decideDistro() == ProcessUtilities.ubuntu: if ProcessUtilities.decideDistro() == ProcessUtilities.ubuntu or ProcessUtilities.decideDistro() == ProcessUtilities.ubuntu20:
data = open('/etc/csf/csf.conf', 'r').readlines() data = open('/etc/csf/csf.conf', 'r').readlines()
writeToConf = open('/etc/csf/csf.conf', 'w') writeToConf = open('/etc/csf/csf.conf', 'w')

14
plogical/dnsUtilities.py
View File

@@ -446,7 +446,7 @@ class DNS:
DNS.createDNSRecord(zone, cNameValue, "CNAME", actualSubDomain, 0, 3600) DNS.createDNSRecord(zone, cNameValue, "CNAME", actualSubDomain, 0, 3600)
if ProcessUtilities.decideDistro() == ProcessUtilities.ubuntu: if ProcessUtilities.decideDistro() == ProcessUtilities.ubuntu or ProcessUtilities.decideDistro() == ProcessUtilities.ubuntu20:
command = 'sudo systemctl restart pdns' command = 'sudo systemctl restart pdns'
ProcessUtilities.executioner(command) ProcessUtilities.executioner(command)
@@ -487,11 +487,11 @@ class DNS:
auth=1) auth=1)
record.save() record.save()
if ProcessUtilities.decideDistro() == ProcessUtilities.ubuntu: if ProcessUtilities.decideDistro() == ProcessUtilities.ubuntu or ProcessUtilities.decideDistro() == ProcessUtilities.ubuntu20:
command = ' systemctl restart pdns' command = ' systemctl restart pdns'
ProcessUtilities.executioner(command) ProcessUtilities.executioner(command)
if ProcessUtilities.decideDistro() == ProcessUtilities.ubuntu: if ProcessUtilities.decideDistro() == ProcessUtilities.ubuntu or ProcessUtilities.decideDistro() == ProcessUtilities.ubuntu20:
command = ' systemctl restart pdns' command = ' systemctl restart pdns'
ProcessUtilities.executioner(command) ProcessUtilities.executioner(command)
@@ -572,7 +572,7 @@ class DNS:
auth=1) auth=1)
record.save() record.save()
if ProcessUtilities.decideDistro() == ProcessUtilities.ubuntu: if ProcessUtilities.decideDistro() == ProcessUtilities.ubuntu or ProcessUtilities.decideDistro() == ProcessUtilities.ubuntu20:
command = 'sudo systemctl restart pdns' command = 'sudo systemctl restart pdns'
ProcessUtilities.executioner(command) ProcessUtilities.executioner(command)
@@ -591,7 +591,7 @@ class DNS:
auth=1) auth=1)
record.save() record.save()
if ProcessUtilities.decideDistro() == ProcessUtilities.ubuntu: if ProcessUtilities.decideDistro() == ProcessUtilities.ubuntu or ProcessUtilities.decideDistro() == ProcessUtilities.ubuntu20:
command = 'sudo systemctl restart pdns' command = 'sudo systemctl restart pdns'
ProcessUtilities.executioner(command) ProcessUtilities.executioner(command)
return return
@@ -608,7 +608,7 @@ class DNS:
auth=1) auth=1)
record.save() record.save()
if ProcessUtilities.decideDistro() == ProcessUtilities.ubuntu: if ProcessUtilities.decideDistro() == ProcessUtilities.ubuntu or ProcessUtilities.decideDistro() == ProcessUtilities.ubuntu20:
command = 'sudo systemctl restart pdns' command = 'sudo systemctl restart pdns'
ProcessUtilities.executioner(command) ProcessUtilities.executioner(command)
return return
@@ -624,7 +624,7 @@ class DNS:
disabled=0, disabled=0,
auth=1) auth=1)
record.save() record.save()
if ProcessUtilities.decideDistro() == ProcessUtilities.ubuntu: if ProcessUtilities.decideDistro() == ProcessUtilities.ubuntu or ProcessUtilities.decideDistro() == ProcessUtilities.ubuntu20:
command = 'sudo systemctl restart pdns' command = 'sudo systemctl restart pdns'
ProcessUtilities.executioner(command) ProcessUtilities.executioner(command)

2
plogical/firewallUtilities.py
View File

@@ -15,7 +15,7 @@ class FirewallUtilities:
@staticmethod @staticmethod
def resFailed(res): def resFailed(res):
if ProcessUtilities.decideDistro() == ProcessUtilities.ubuntu and res != 0: if (ProcessUtilities.decideDistro() == ProcessUtilities.ubuntu or ProcessUtilities.decideDistro() == ProcessUtilities.ubuntu20) and res != 0:
return True return True
elif ProcessUtilities.decideDistro() == ProcessUtilities.centos and res == 1: elif ProcessUtilities.decideDistro() == ProcessUtilities.centos and res == 1:
return True return True

2
plogical/mailUtilities.py
View File

@@ -502,7 +502,7 @@ milter_default_action = accept
def configureSpamAssassin(): def configureSpamAssassin():
try: try:
if ProcessUtilities.decideDistro() == ProcessUtilities.ubuntu: if ProcessUtilities.decideDistro() == ProcessUtilities.ubuntu or ProcessUtilities.decideDistro() == ProcessUtilities.ubuntu20:
confFile = "/etc/mail/spamassassin/local.cf" confFile = "/etc/mail/spamassassin/local.cf"
confData = open(confFile).readlines() confData = open(confFile).readlines()

8
serverStatus/views.py
View File

@@ -730,7 +730,7 @@ def fetchPackages(request):
recordsToShow = int(data['recordsToShow']) recordsToShow = int(data['recordsToShow'])
type = data['type'] type = data['type']
if ProcessUtilities.decideDistro() == ProcessUtilities.ubuntu: if ProcessUtilities.decideDistro() == ProcessUtilities.ubuntu or ProcessUtilities.decideDistro() == ProcessUtilities.ubuntu20:
command = 'apt-mark showhold' command = 'apt-mark showhold'
locked = ProcessUtilities.outputExecutioner(command).split('\n') locked = ProcessUtilities.outputExecutioner(command).split('\n')
@@ -850,7 +850,7 @@ def fetchPackages(request):
import re import re
for items in finalPackages: for items in finalPackages:
if ProcessUtilities.decideDistro() == ProcessUtilities.ubuntu: if ProcessUtilities.decideDistro() == ProcessUtilities.ubuntu or ProcessUtilities.decideDistro() == ProcessUtilities.ubuntu20:
try: try:
if type == 'CyberPanel': if type == 'CyberPanel':
@@ -977,7 +977,7 @@ def fetchPackageDetails(request):
data = json.loads(request.body) data = json.loads(request.body)
package = data['package'] package = data['package']
if ProcessUtilities.decideDistro() == ProcessUtilities.ubuntu: if ProcessUtilities.decideDistro() == ProcessUtilities.ubuntu or ProcessUtilities.decideDistro() == ProcessUtilities.ubuntu20:
command = 'apt-cache show %s' % (package) command = 'apt-cache show %s' % (package)
packageDetails = ProcessUtilities.outputExecutioner(command) packageDetails = ProcessUtilities.outputExecutioner(command)
elif ProcessUtilities.decideDistro() == ProcessUtilities.centos: elif ProcessUtilities.decideDistro() == ProcessUtilities.centos:
@@ -1047,7 +1047,7 @@ def lockStatus(request):
package = data['package'] package = data['package']
type = data['type'] type = data['type']
if ProcessUtilities.decideDistro() == ProcessUtilities.ubuntu: if ProcessUtilities.decideDistro() == ProcessUtilities.ubuntu or ProcessUtilities.decideDistro() == ProcessUtilities.ubuntu20:
if type == 0: if type == 0:
command = 'apt-mark unhold %s' % (package) command = 'apt-mark unhold %s' % (package)

2
websiteFunctions/website.py
View File

@@ -1605,7 +1605,7 @@ class WebsiteManager:
output = ProcessUtilities.outputExecutioner(execPath, website.externalApp) output = ProcessUtilities.outputExecutioner(execPath, website.externalApp)
if ProcessUtilities.decideDistro() == ProcessUtilities.ubuntu: if ProcessUtilities.decideDistro() == ProcessUtilities.ubuntu or ProcessUtilities.decideDistro() == ProcessUtilities.ubuntu20:
command = 'chmod 600 %s' % (cronPath) command = 'chmod 600 %s' % (cronPath)
ProcessUtilities.executioner(command) ProcessUtilities.executioner(command)