Skip to content

Commit 5c56ade

Browse files
committed
bug fix restic
1 parent ef8fdec commit 5c56ade

File tree

2 files changed

+34
-21
lines changed

2 files changed

+34
-21
lines changed

emailMarketing/templates/emailMarketing/manageLists.html

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -73,9 +73,8 @@ <h4 class="modal-title">{% trans "You are doing to delete this list.." %}
7373
class="btn ra-100 btn-blue-alt">{% trans 'Verify' %}</button>
7474
</div>
7575
<div class="col-sm-3">
76-
<a target="_blank" href="/emailMarketing/{{ domain }}/configureVerify">
77-
<button class="btn ra-100 btn-blue-alt">{% trans 'Configure Verification' %}</button>
78-
</a>
76+
<button onclick="location.href='/emailMarketing/{{ domain }}/configureVerify'"
77+
class="btn ra-100 btn-blue-alt">{% trans 'Configure Verification' %}</button>
7978
</div>
8079
<div class="col-sm-3">
8180
<button ng-click="fetchLogs()" data-toggle="modal" data-target="#verificationLogs"
@@ -99,21 +98,21 @@ <h4 class="modal-title">{% trans "Verification Logs" %}
9998
<div ng-hide="currentRecords" class="form-group">
10099

101100
<table style="margin: 0px; padding-bottom: 2%" class="table">
102-
<thead>
103-
<tr>
104-
<th>{% trans "Total Emails" %}</th>
105-
<th>{% trans "Verified" %}</th>
106-
<th>{% trans "Not-Verified" %}</th>
107-
</tr>
108-
</thead>
109-
<tbody>
110-
<tr>
111-
<td>{$ totalEmails $}</td>
112-
<td>{$ verified $}</td>
113-
<td>{$ notVerified $}</td>
114-
</tr>
115-
</tbody>
116-
</table>
101+
<thead>
102+
<tr>
103+
<th>{% trans "Total Emails" %}</th>
104+
<th>{% trans "Verified" %}</th>
105+
<th>{% trans "Not-Verified" %}</th>
106+
</tr>
107+
</thead>
108+
<tbody>
109+
<tr>
110+
<td>{$ totalEmails $}</td>
111+
<td>{$ verified $}</td>
112+
<td>{$ notVerified $}</td>
113+
</tr>
114+
</tbody>
115+
</table>
117116

118117
<div class="col-sm-10">
119118
<input placeholder="Search Logs..." name="dom" type="text"

install/install.py

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1950,10 +1950,24 @@ def installRestic(self):
19501950

19511951
if self.distro == centos:
19521952
command = 'yum --enablerepo=CyberPanel install restic -y'
1953-
else:
1954-
command = 'dnf install restic -y --nogpgcheck'
1953+
preFlightsChecks.call(command, self.distro, command, command, 1, 0, os.EX_OSERR)
1954+
elif self.distro == cent8:
1955+
1956+
command = 'cat /proc/cpuinfo'
1957+
1958+
result = subprocess.check_output(shlex.split(command)).decode("utf-8")
1959+
1960+
if result.find('ARM') > -1 or result.find('arm') > -1:
1961+
command = 'wget -O /usr/bin/restic https://rep.cyberpanel.net/restic_0.9.6_linux_arm64'
1962+
preFlightsChecks.call(command, self.distro, command, command, 1, 0, os.EX_OSERR)
1963+
1964+
else:
1965+
command = 'wget -O /usr/bin/restic https://rep.cyberpanel.net/restic_0.9.6_linux_amd64'
1966+
preFlightsChecks.call(command, self.distro, command, command, 1, 0, os.EX_OSERR)
1967+
1968+
command = 'chmod +x /usr/bin/restic'
1969+
preFlightsChecks.call(command, self.distro, command, command, 1, 0, os.EX_OSERR)
19551970

1956-
preFlightsChecks.call(command, self.distro, command, command, 1, 0, os.EX_OSERR)
19571971
else:
19581972
command = 'apt-get update -y'
19591973
preFlightsChecks.call(command, self.distro, command, command, 1, 0, os.EX_OSERR)

0 commit comments

Comments
 (0)