Nemcio/CyberPanel
1
0
Fork 0
mirror of https://github.com/usmannasir/cyberpanel.git synced 2026-01-22 23:42:06 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'v2.3.2' into v2.3.3-dev

Browse Source
This commit is contained in:
Usman Nasir
2022-06-28 14:15:12 +05:00
parent 76250685a7 658b2a1093
commit 8966c5b4d5
5 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CyberCP/settings.py
View File

@@ -24,7 +24,7 @@ BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
SECRET_KEY = 'xr%j*p!*$0d%(-(e%@-*hyoz4$f%y77coq0u)6pwmjg4)q&19f'
# SECURITY WARNING: don't run with debug turned on in production!
DEBUG = True
DEBUG = False
ALLOWED_HOSTS = ['*']

2
baseTemplate/templates/baseTemplate/index.html
View File

@@ -399,7 +399,7 @@
<li>
<a href="{% url 'loadWebsitesHome' %}" title="{% trans 'WordPress' %}">
<div class="glyph-icon icon-wordpress" title="{% trans 'WordPress' %}"></div>
<span>{% trans "WordPresss" %}</span>
<span>{% trans "WordPress" %}</span>
</a>
<div class="sidebar-submenu">

2
install/install.py
View File

@@ -728,7 +728,7 @@ password="%s"
preFlightsChecks.call(command, self.distro, '[download_install_phpmyadmin]',
command, 1, 0, os.EX_OSERR)
command = 'unzip /usr/local/CyberCP/public/phpmyadmin.zip -d /usr/local/CyberCP/public/'
command = 'unzip /usr/local/CyberCP/public/phpmyadmin.zip -d /usr/local/CyberCP/public/phpmyadmin'
preFlightsChecks.call(command, self.distro, '[download_install_phpmyadmin]',
command, 1, 0, os.EX_OSERR)

4
plogical/upgrade.py
View File

@@ -287,7 +287,7 @@ class Upgrade:
command = 'wget -O /usr/local/CyberCP/public/phpmyadmin.zip https://github.com/usmannasir/cyberpanel/raw/stable/phpmyadmin.zip'
Upgrade.executioner(command, 0)
command = 'unzip /usr/local/CyberCP/public/phpmyadmin.zip -d /usr/local/CyberCP/public/'
command = 'unzip /usr/local/CyberCP/public/phpmyadmin.zip -d /usr/local/CyberCP/public/phpmyadmin'
Upgrade.executioner(command, 0)
command = 'mv /usr/local/CyberCP/public/phpMyAdmin-*-all-languages /usr/local/CyberCP/public/phpmyadmin'
@@ -2786,7 +2786,7 @@ vmail
command = execPath + " --function submitinstallImunifyAV"
Upgrade.executioner(command, command, 1)
command = 'chmod +x /usr/local/CyberCP/bin/python /usr/local/CyberCP/CLManager/CageFS.py'
command = 'chmod +x /usr/local/CyberCP/public/imunifyav/bin/execute.py'
Upgrade.executioner(command, command, 1)

3
websiteFunctions/templates/websiteFunctions/website.html
View File

@@ -1050,14 +1050,13 @@
<div class="col-md-3 panel-body">
<a href="{$ installMauticURL $}" target="_self"
title="{% trans 'Install Mautic' %}">
<img src="{% static 'images/icons/mautic.png' %}" width="65" class="mr-10">
<img src="{% static 'baseTemplate/images/icons/mautic.png' %}" width="65" class="mr-10">
</a>
<a href="{$ installMauticURL $}" target="_self"
title="{% trans 'Install Mautic' %}">
<span class="h4">{% trans "Mautic" %}</span>
</a>
</div>
</div>
</div>