mirror
/
cyberpanel
mirror of https://github.com/usmannasir/cyberpanel.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bug fix restic

This commit is contained in:
Usman Nasir 2020-06-12 12:08:15 +05:00
parent ef8fdecef2
commit 5c56adeb40
2 changed files with 34 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
emailMarketing/templates/emailMarketing/manageLists.html
View File

@ -73,9 +73,8 @@
class="btn ra-100 btn-blue-alt">{% trans 'Verify' %}</button>
</div>
<div class="col-sm-3">
<a target="_blank" href="/emailMarketing/{{ domain }}/configureVerify">
<button class="btn ra-100 btn-blue-alt">{% trans 'Configure Verification' %}</button>
</a>
<button onclick="location.href='/emailMarketing/{{ domain }}/configureVerify'"
class="btn ra-100 btn-blue-alt">{% trans 'Configure Verification' %}</button>
</div>
<div class="col-sm-3">
<button ng-click="fetchLogs()" data-toggle="modal" data-target="#verificationLogs"
@ -99,21 +98,21 @@
<div ng-hide="currentRecords" class="form-group">
<table style="margin: 0px; padding-bottom: 2%" class="table">
<thead>
<tr>
<th>{% trans "Total Emails" %}</th>
<th>{% trans "Verified" %}</th>
<th>{% trans "Not-Verified" %}</th>
</tr>
</thead>
<tbody>
<tr>
<td>{$ totalEmails $}</td>
<td>{$ verified $}</td>
<td>{$ notVerified $}</td>
</tr>
</tbody>
</table>
<thead>
<tr>
<th>{% trans "Total Emails" %}</th>
<th>{% trans "Verified" %}</th>
<th>{% trans "Not-Verified" %}</th>
</tr>
</thead>
<tbody>
<tr>
<td>{$ totalEmails $}</td>
<td>{$ verified $}</td>
<td>{$ notVerified $}</td>
</tr>
</tbody>
</table>
<div class="col-sm-10">
<input placeholder="Search Logs..." name="dom" type="text"

20
install/install.py
View File

@ -1950,10 +1950,24 @@ milter_default_action = accept
if self.distro == centos:
command = 'yum --enablerepo=CyberPanel install restic -y'
else:
command = 'dnf install restic -y --nogpgcheck'
preFlightsChecks.call(command, self.distro, command, command, 1, 0, os.EX_OSERR)
elif self.distro == cent8:
command = 'cat /proc/cpuinfo'
result = subprocess.check_output(shlex.split(command)).decode("utf-8")
if result.find('ARM') > -1 or result.find('arm') > -1:
command = 'wget -O /usr/bin/restic https://rep.cyberpanel.net/restic_0.9.6_linux_arm64'
preFlightsChecks.call(command, self.distro, command, command, 1, 0, os.EX_OSERR)
else:
command = 'wget -O /usr/bin/restic https://rep.cyberpanel.net/restic_0.9.6_linux_amd64'
preFlightsChecks.call(command, self.distro, command, command, 1, 0, os.EX_OSERR)
command = 'chmod +x /usr/bin/restic'
preFlightsChecks.call(command, self.distro, command, command, 1, 0, os.EX_OSERR)
preFlightsChecks.call(command, self.distro, command, command, 1, 0, os.EX_OSERR)
else:
command = 'apt-get update -y'
preFlightsChecks.call(command, self.distro, command, command, 1, 0, os.EX_OSERR)