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

bug fix: default dkim to 1

Browse Source
This commit is contained in:
usmannasir
2024-09-27 15:00:23 +05:00
parent 44f7c7e8e8
commit ef85135e19
3 changed files with 26 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
websiteFunctions/templates/websiteFunctions/createDomain.html
View File

@@ -212,10 +212,10 @@
<label>
{% if test_domain_data %}
<input ng-model="apacheBackend" type="checkbox" value="">
Apache as Reverse Proxy (Beta, for Ubuntu 22 and AlmaLinux 8)
OpenLiteSpeed + Apache (Backend) (For Ubuntu 22, AlmaLinux 8 and AlmaLinux 9.)
{% else %}
<input ng-model="apacheBackend" type="checkbox" value="" disabled>
OpenLiteSpeed + Apache (Backend) (For Ubuntu 22 and AlmaLinux 8) -
OpenLiteSpeed + Apache (Backend) (For Ubuntu 22, AlmaLinux 8 and AlmaLinux 9.) -
<strong><a href="https://go.cyberpanel.net/ApacheRev">Premium
Feature</a> <i
class="p fa fa-external-link btn-icon"> </i></strong>
@@ -223,26 +223,17 @@
</label>
</div>
</div>
{# <label class="col-sm-3 control-label"></label>#}
{# <div class="col-sm-9">#}
{# <div class="checkbox">#}
{# <label>#}
{# <input ng-model="openBasedir" type="checkbox" value="">#}
{# open_basedir Protection#}
{# </label>#}
{# </div>#}
{# </div>#}
</div>
<label class="col-sm-3 control-label"></label>
<div class="col-sm-9">
<div class="checkbox">
<label>
<input ng-model="dkimCheck" type="checkbox" value="">
DKIM Support
</label>
</div>
</div>
<label class="col-sm-3 control-label"></label>
<div class="col-sm-9">
<div class="checkbox">
<label>
<input ng-model="openBasedir" type="checkbox" value="">
open_basedir Protection
</label>
</div>
</div>
</div>
<div ng-hide="DomainCreateForm" class="form-group">
<label class="col-sm-3 control-label"></label>

31
websiteFunctions/templates/websiteFunctions/createWebsite.html
View File

@@ -179,35 +179,26 @@
<label>
{% if test_domain_data %}
<input ng-model="apacheBackend" type="checkbox" value="">
OpenLiteSpeed + Apache (Backend) (For Ubuntu 22 and AlmaLinux 8)
OpenLiteSpeed + Apache (Backend) (For Ubuntu 22, AlmaLinux 8 and AlmaLinux 9.)
{% else %}
<input ng-model="apacheBackend" type="checkbox" value="" disabled>
OpenLiteSpeed + Apache (Backend) (For Ubuntu 22 and AlmaLinux 8) -
OpenLiteSpeed + Apache (Backend) (For Ubuntu 22, AlmaLinux 8 and AlmaLinux 9.) -
<strong><a href="https://go.cyberpanel.net/ApacheRev">Premium Feature</a> <i
class="p fa fa-external-link btn-icon"> </i></strong>
{% endif %}
</label>
</div>
</div>
<label class="col-sm-3 control-label"></label>
<div class="col-sm-9">
<div class="checkbox">
<label>
<input ng-model="dkimCheck" type="checkbox" value="">
DKIM Support
</label>
</div>
</div>
<label class="col-sm-3 control-label"></label>
<div class="col-sm-9">
<div class="checkbox">
<label>
<input ng-model="openBasedir" type="checkbox" value="">
open_basedir Protection
</label>
</div>
</div>
{# <label class="col-sm-3 control-label"></label>#}
{# <div class="col-sm-9">#}
{# <div class="checkbox">#}
{# <label>#}
{# <input ng-model="openBasedir" type="checkbox" value="">#}
{# open_basedir Protection#}
{# </label>#}
{# </div>#}
{# </div>#}
<label class="col-sm-3 control-label"></label>
<div class="col-sm-9">
<div class="checkbox">

7
websiteFunctions/website.py
View File

@@ -2218,7 +2218,7 @@ class WebsiteManager:
execPath = execPath + " createVirtualHost --virtualHostName " + domain + \
" --administratorEmail " + adminEmail + " --phpVersion '" + phpSelection + \
"' --virtualHostUser " + externalApp + " --ssl " + str(data['ssl']) + " --dkimCheck " \
+ str(data['dkimCheck']) + " --openBasedir " + str(data['openBasedir']) + \
+ str(1) + " --openBasedir " + str(data['openBasedir']) + \
' --websiteOwner "' + websiteOwner + '" --package "' + packageName + '" --tempStatusPath ' + tempStatusPath + " --apache " + apacheBackend + " --mailDomain %s" % (
mailDomain)
@@ -2319,8 +2319,7 @@ class WebsiteManager:
execPath = "/usr/local/CyberCP/bin/python " + virtualHostUtilities.cyberPanel + "/plogical/virtualHostUtilities.py"
execPath = execPath + " createDomain --masterDomain " + masterDomain + " --virtualHostName " + domain + \
" --phpVersion '" + phpSelection + "' --ssl " + str(data['ssl']) + " --dkimCheck " + str(
data['dkimCheck']) \
" --phpVersion '" + phpSelection + "' --ssl " + str(data['ssl']) + " --dkimCheck " + str(1) \
+ " --openBasedir " + str(data['openBasedir']) + ' --path ' + path + ' --websiteOwner ' \
+ admin.userName + ' --tempStatusPath ' + tempStatusPath + " --apache " + apacheBackend + f' --aliasDomain {str(alias)}'
@@ -4541,7 +4540,7 @@ StrictHostKeyChecking no
websiteOwner = data['websiteOwner']
ownerPassword = data['ownerPassword']
data['ssl'] = 1
data['dkimCheck'] = 0
data['dkimCheck'] = 1
data['openBasedir'] = 1
data['adminEmail'] = data['ownerEmail']
data['phpSelection'] = "PHP 7.4"