Nemcio/CyberPanel
1
0
Fork 0
mirror of https://github.com/usmannasir/cyberpanel.git synced 2026-05-10 00:26:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

bug fix: dont start pdns if service disabled

Browse Source
This commit is contained in:
Usman Nasir
2021-01-18 00:38:01 +05:00
parent 98d4187920
commit 3ea621cc2d
2 changed files with 25 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
plogical/IncScheduler.py
View File

@@ -335,7 +335,6 @@ class IncScheduler():
message='Backup for %s successfully sent to Google Drive.' % (website.domain)).save()
os.remove(completeFileToSend)
except BaseException as msg:
GDriveJobLogs(owner=items, status=backupSchedule.ERROR,
message='[Site] Site backup failed, Error message: %s.' % (str(msg))).save()

33
plogical/dnsUtilities.py
View File

@@ -637,8 +637,12 @@ class DNS:
record.save()
if ProcessUtilities.decideDistro() == ProcessUtilities.ubuntu or ProcessUtilities.decideDistro() == ProcessUtilities.ubuntu20:
command = 'sudo systemctl restart pdns'
ProcessUtilities.executioner(command)
command = 'ls -la /etc/systemd/system/multi-user.target.wants/pdns.service'
result = ProcessUtilities.outputExecutioner(command)
if result.find('No such file') == -1:
command = 'sudo systemctl restart pdns'
ProcessUtilities.executioner(command)
return
@@ -656,8 +660,12 @@ class DNS:
record.save()
if ProcessUtilities.decideDistro() == ProcessUtilities.ubuntu or ProcessUtilities.decideDistro() == ProcessUtilities.ubuntu20:
command = 'sudo systemctl restart pdns'
ProcessUtilities.executioner(command)
command = 'ls -la /etc/systemd/system/multi-user.target.wants/pdns.service'
result = ProcessUtilities.outputExecutioner(command)
if result.find('No such file') == -1:
command = 'sudo systemctl restart pdns'
ProcessUtilities.executioner(command)
return
if type == 'MX':
@@ -673,8 +681,12 @@ class DNS:
record.save()
if ProcessUtilities.decideDistro() == ProcessUtilities.ubuntu or ProcessUtilities.decideDistro() == ProcessUtilities.ubuntu20:
command = 'sudo systemctl restart pdns'
ProcessUtilities.executioner(command)
command = 'ls -la /etc/systemd/system/multi-user.target.wants/pdns.service'
result = ProcessUtilities.outputExecutioner(command)
if result.find('No such file') == -1:
command = 'sudo systemctl restart pdns'
ProcessUtilities.executioner(command)
return
if Records.objects.filter(name=name, type=type).count() == 0:
@@ -689,8 +701,13 @@ class DNS:
auth=1)
record.save()
if ProcessUtilities.decideDistro() == ProcessUtilities.ubuntu or ProcessUtilities.decideDistro() == ProcessUtilities.ubuntu20:
command = 'sudo systemctl restart pdns'
ProcessUtilities.executioner(command)
command = 'ls -la /etc/systemd/system/multi-user.target.wants/pdns.service'
result = ProcessUtilities.outputExecutioner(command)
if result.find('No such file') == -1:
command = 'sudo systemctl restart pdns'
ProcessUtilities.executioner(command)
## Add Record to CF if SYNC Enabled