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

Updated with new logic to install restic from latest release source for centos for https://github.com/usmannasir/cyberpanel/issues/580

Browse Source
This commit is contained in:
Michael Ramsey
2021-04-18 21:44:54 -04:00
parent a48c89f163
commit 3a839e1679
2 changed files with 26 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
IncBackups/IncBackupsControl.py
View File

@@ -4,7 +4,7 @@ import os.path
import shlex import shlex
import subprocess import subprocess
import sys import sys
import requests
sys.path.append('/usr/local/CyberCP') sys.path.append('/usr/local/CyberCP')
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "CyberCP.settings") os.environ.setdefault("DJANGO_SETTINGS_MODULE", "CyberCP.settings")
@@ -869,25 +869,24 @@ Subject: %s
import platform import platform
distro = 'centos' distro = 'centos'
release = platform.uname().release release = platform.uname().release
url = 'https://api.github.com/repos/restic/restic/releases/latest'
releases = json.loads(str(requests.get(url).text))
version = releases['tag_name'].strip('v')
download_url = f'https://github.com/restic/restic/releases/download/v{version}/restic_{version}_linux_amd64.bz2'
ResticArchivePath = f'/root/restic_{version}_linux_amd64.bz2'
ResticBinPath = '/usr/local/bin/restic'
if distro == 'centos' and 'el7' in release: if distro == 'centos' and 'el7' in release:
command = 'yum install restic -y' command = 'yum install restic -y'
ProcessUtilities.executioner(command) ProcessUtilities.executioner(command)
elif distro == 'centos' and 'el8' in release: elif distro == 'centos' and 'el8' in release:
command = 'cat /proc/cpuinfo' command = 'wget -O %s %s' % (ResticArchivePath, download_url)
ProcessUtilities.executioner(command)
result = subprocess.check_output(shlex.split(command)).decode("utf-8") command = 'bzip2 -dc %s > %s' % (ResticArchivePath, ResticBinPath)
ProcessUtilities.executioner(command)
if result.find('ARM') > -1 or result.find('arm') > -1: command = 'chmod +x %s' % ResticBinPath
command = 'wget -O /usr/bin/restic https://rep.cyberpanel.net/restic_0.9.6_linux_arm64'
ProcessUtilities.executioner(command)
else:
command = 'wget -O /usr/bin/restic https://rep.cyberpanel.net/restic_0.9.6_linux_amd64'
ProcessUtilities.executioner(command)
command = 'chmod +x /usr/bin/restic'
ProcessUtilities.executioner(command) ProcessUtilities.executioner(command)
else: else:
command = 'apt-get update -y' command = 'apt-get update -y'
ProcessUtilities.executioner(command) ProcessUtilities.executioner(command)

24
dns/dnsManager.py
View File

@@ -269,7 +269,7 @@ class DNSManager:
if recordType == "A": if recordType == "A":
recordContentA = data['recordContentA'] ## IP or ponting value recordContentA = data['recordContentA'] ## IP or pointing value
if recordName == "@": if recordName == "@":
value = zoneDomain value = zoneDomain
@@ -309,7 +309,7 @@ class DNSManager:
else: else:
value = recordName + "." + zoneDomain value = recordName + "." + zoneDomain
recordContentAAAA = data['recordContentAAAA'] ## IP or ponting value recordContentAAAA = data['recordContentAAAA'] ## IP or pointing value
DNS.createDNSRecord(zone, value, recordType, recordContentAAAA, 0, ttl) DNS.createDNSRecord(zone, value, recordType, recordContentAAAA, 0, ttl)
@@ -324,7 +324,7 @@ class DNSManager:
else: else:
value = recordName + "." + zoneDomain value = recordName + "." + zoneDomain
recordContentCNAME = data['recordContentCNAME'] ## IP or ponting value recordContentCNAME = data['recordContentCNAME'] ## IP or pointing value
DNS.createDNSRecord(zone, value, recordType, recordContentCNAME, 0, ttl) DNS.createDNSRecord(zone, value, recordType, recordContentCNAME, 0, ttl)
@@ -339,7 +339,7 @@ class DNSManager:
else: else:
value = recordName + "." + zoneDomain value = recordName + "." + zoneDomain
recordContentSPF = data['recordContentSPF'] ## IP or ponting value recordContentSPF = data['recordContentSPF'] ## IP or pointing value
DNS.createDNSRecord(zone, value, recordType, recordContentSPF, 0, ttl) DNS.createDNSRecord(zone, value, recordType, recordContentSPF, 0, ttl)
@@ -354,7 +354,7 @@ class DNSManager:
else: else:
value = recordName + "." + zoneDomain value = recordName + "." + zoneDomain
recordContentTXT = data['recordContentTXT'] ## IP or ponting value recordContentTXT = data['recordContentTXT'] ## IP or pointing value
DNS.createDNSRecord(zone, value, recordType, recordContentTXT, 0, ttl) DNS.createDNSRecord(zone, value, recordType, recordContentTXT, 0, ttl)
@@ -404,7 +404,7 @@ class DNSManager:
value = recordName value = recordName
else: else:
value = recordName + "." + zoneDomain value = recordName + "." + zoneDomain
recordContentCAA = data['recordContentCAA'] ## IP or ponting value recordContentCAA = data['recordContentCAA'] ## IP or pointing value
DNS.createDNSRecord(zone, value, recordType, recordContentCAA, 0, ttl) DNS.createDNSRecord(zone, value, recordType, recordContentCAA, 0, ttl)
final_dic = {'status': 1, 'add_status': 1, 'error_message': "None"} final_dic = {'status': 1, 'add_status': 1, 'error_message': "None"}
@@ -849,7 +849,7 @@ class DNSManager:
if recordType == "A": if recordType == "A":
recordContentA = data['recordContentA'] ## IP or ponting value recordContentA = data['recordContentA'] ## IP or pointing value
if recordName == "@": if recordName == "@":
value = zoneDomain value = zoneDomain
@@ -889,7 +889,7 @@ class DNSManager:
else: else:
value = recordName + "." + zoneDomain value = recordName + "." + zoneDomain
recordContentAAAA = data['recordContentAAAA'] ## IP or ponting value recordContentAAAA = data['recordContentAAAA'] ## IP or pointing value
DNS.createDNSRecordCloudFlare(cf, zone, value, recordType, recordContentAAAA, 0, ttl) DNS.createDNSRecordCloudFlare(cf, zone, value, recordType, recordContentAAAA, 0, ttl)
@@ -904,7 +904,7 @@ class DNSManager:
else: else:
value = recordName + "." + zoneDomain value = recordName + "." + zoneDomain
recordContentCNAME = data['recordContentCNAME'] ## IP or ponting value recordContentCNAME = data['recordContentCNAME'] ## IP or pointing value
DNS.createDNSRecordCloudFlare(cf, zone, value, recordType, recordContentCNAME, 0, ttl) DNS.createDNSRecordCloudFlare(cf, zone, value, recordType, recordContentCNAME, 0, ttl)
@@ -919,7 +919,7 @@ class DNSManager:
else: else:
value = recordName + "." + zoneDomain value = recordName + "." + zoneDomain
recordContentSPF = data['recordContentSPF'] ## IP or ponting value recordContentSPF = data['recordContentSPF'] ## IP or pointing value
DNS.createDNSRecordCloudFlare(cf, zone, value, recordType, recordContentSPF, 0, ttl) DNS.createDNSRecordCloudFlare(cf, zone, value, recordType, recordContentSPF, 0, ttl)
@@ -934,7 +934,7 @@ class DNSManager:
else: else:
value = recordName + "." + zoneDomain value = recordName + "." + zoneDomain
recordContentTXT = data['recordContentTXT'] ## IP or ponting value recordContentTXT = data['recordContentTXT'] ## IP or pointing value
DNS.createDNSRecordCloudFlare(cf, zone, value, recordType, recordContentTXT, 0, ttl) DNS.createDNSRecordCloudFlare(cf, zone, value, recordType, recordContentTXT, 0, ttl)
@@ -984,7 +984,7 @@ class DNSManager:
value = recordName value = recordName
else: else:
value = recordName + "." + zoneDomain value = recordName + "." + zoneDomain
recordContentCAA = data['recordContentCAA'] ## IP or ponting value recordContentCAA = data['recordContentCAA'] ## IP or pointing value
DNS.createDNSRecordCloudFlare(cf, zone, value, recordType, recordContentCAA, 0, ttl) DNS.createDNSRecordCloudFlare(cf, zone, value, recordType, recordContentCAA, 0, ttl)
final_dic = {'status': 1, 'add_status': 1, 'error_message': "None"} final_dic = {'status': 1, 'add_status': 1, 'error_message': "None"}