Nemcio/CyberPanel
1
0
Fork 0
mirror of https://github.com/usmannasir/cyberpanel.git synced 2025-11-08 14:26:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

resolve: https://github.com/usmannasir/cyberpanel/issues/942

Browse Source
This commit is contained in:
Usman Nasir
2022-08-07 08:19:11 +05:00
parent a65782b7cb
commit 148f9f055a
4 changed files with 40 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
emailPremium/templates/emailPremium/Rspamd.html
View File

@@ -12,7 +12,7 @@
<div id="page-title">
<h2>{% trans "Rspamd Configurations!" %} -
</h2>
<p>{% trans "On this page you can configure RSPAMD settings." %}</p>
<p>{% trans "On this page you can configure Rspamd settings." %}</p>
</div>
<div ng-controller="Rspamd" class="example-box-wrapper">
@@ -26,20 +26,21 @@
<div style="width: 100%; margin: 0 auto">
<div ng-hide="uninstallbutton" class="col-lg-3" style="float: left">
<button type="button" data-toggle="modal" data-target="#ViewRspamdlog" ng-click="FetchRspamdLog()"
class="btn btn-primaryb btn-lg btn-block">{% trans "View Rsmapd Log" %}</button>
<button type="button" data-toggle="modal" data-target="#ViewRspamdlog"
ng-click="FetchRspamdLog()"
class="btn btn-primaryb btn-lg btn-block">{% trans "View Rspamd Logs" %}</button>
</div>
<div ng-hide="uninstallbutton" class="col-lg-2" style="float: left">
<div ng-hide="uninstallbutton" class="col-lg-3" style="float: left">
<button type="button" data-toggle="modal" data-target="#UninstallRspamdmodal"
class="btn btn-danger btn-lg btn-block">{% trans "uninstall." %}</button>
class="btn btn-danger btn-lg btn-block">{% trans "Un-install Rspamd" %}</button>
</div>
<div ng-hide="uninstallbutton" class="col-lg-2" style="float: left">
<div ng-hide="uninstallbutton" class="col-lg-6" style="float: left">
<button type="button" ng-click="RestartRspamd()"
class="btn btn-gray btn-lg btn-block">{% trans "Restart" %}</button>
class="btn btn-gray btn-lg btn-block">{% trans "Restart Rspamd and CLAMAV" %}</button>
</div>
</div>
@@ -164,8 +165,11 @@
<!-----------------------------------------ClamAv--------------------------->
<div style="padding: 2%" class="col-md-12">
<h3 class="content-box-header">
{% trans "ClamAV" %}
{% trans "ClamAV - This is CLAMV Configurations in Rspamd" %}
</h3>
<p style="margin: 1%">
<strong>Warning</strong> {% trans "this is advanced settings, do not change if you don't know what you are doing" %}.
</p>
<form action="/" id="createPackages" class="form-horizontal bordered-row">
<div ng-hide="phpDetailsBox" class="form-group">
@@ -263,6 +267,10 @@
<img ng-hide="CLamAVLoading"
src="/static/images/loading.gif">
</h3>
<p style="margin: 1%">
<strong>Warning</strong> {% trans "this is advanced settings, do not change if you don't know what you are doing" %}.
</p>
<form action="/" id="createPackages" class="form-horizontal bordered-row">
<div ng-hide="phpDetailsBox" class="form-group">
<label class="col-sm-4 control-label">TCPSocket</label>
@@ -330,9 +338,13 @@
<!-----------------------------------------postfix--------------------------->
<div style="padding: 2%" class="col-md-12">
<h3 class="content-box-header">
{% trans "Postfix" %}<img ng-hide="postfixLoading"
{% trans "Postfix Configurations for Rspamd" %}<img ng-hide="postfixLoading"
src="/static/images/loading.gif">
</h3>
<p style="margin: 1%">
<strong>Warning</strong> {% trans "this is advanced settings, do not change if you don't know what you are doing" %}.
</p>
<form action="/" id="createPackages" class="form-horizontal bordered-row">
<div class="form-group">
@@ -387,6 +399,10 @@
<h3 class="content-box-header">
{% trans "Redis" %}<img ng-hide="RedisLoading" src="/static/images/loading.gif">
</h3>
<p style="margin: 1%">
<strong>Warning</strong> {% trans "this is advanced settings, do not change if you don't know what you are doing" %}.
</p>
<form action="/" id="createPackages" class="form-horizontal bordered-row">
<div class="form-group">
@@ -489,12 +505,13 @@
</h4>
</div>
<div class="modal-body">
<textarea ng-model="RspamdlogsData" class="form-control" rows="30">{{ Rspamdlogs }}</textarea>
<textarea ng-model="RspamdlogsData" class="form-control"
rows="30">{{ Rspamdlogs }}</textarea>
</div>
<div class="modal-footer">
<button type="button"
class="btn btn-primary" data-dismiss="modal" >yes
class="btn btn-primary" data-dismiss="modal">yes
</button>
<button type="button"
class="btn btn-default" data-dismiss="modal">

3
install/installCyberPanel.py
View File

@@ -252,6 +252,9 @@ class InstallCyberPanel:
command = 'dnf install lsphp71* lsphp72* lsphp73* lsphp74* lsphp80* --exclude lsphp73-pecl-zip --exclude *imagick* -y'
subprocess.call(command, shell=True)
command = 'dnf install lsphp81* --exclude *imagick* -y'
subprocess.call(command, shell=True)
if self.distro == openeuler:
command = 'dnf install lsphp71* lsphp72* lsphp73* lsphp74* lsphp80* -y'
subprocess.call(command, shell=True)

1
plogical/IncScheduler.py
View File

@@ -907,7 +907,6 @@ Automatic backup failed for %s on %s.
command = 'chattr -R -i /home/%s/incbackup/' % (website.domain)
ProcessUtilities.executioner(command)
else:
command = 'chattr -R -i /home/%s/' % (website.domain)
ProcessUtilities.executioner(command)

1
websiteFunctions/website.py
View File

@@ -1,4 +1,5 @@
#!/usr/local/CyberCP/bin/python
import html
import os
import os.path
import sys