Skip to content

Commit

Permalink
bug fix: default dkim to 1
Browse files Browse the repository at this point in the history
  • Loading branch information
usmannasir committed Sep 27, 2024
1 parent 44f7c7e commit ef85135
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 45 deletions.
33 changes: 12 additions & 21 deletions websiteFunctions/templates/websiteFunctions/createDomain.html
Original file line number Diff line number Diff line change
Expand Up @@ -212,38 +212,29 @@ <h3 class="content-box-header">
<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>
{% 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>#}
</div>


<div ng-hide="DomainCreateForm" class="form-group">
<label class="col-sm-3 control-label"></label>
<div class="col-sm-4">
Expand Down
31 changes: 11 additions & 20 deletions websiteFunctions/templates/websiteFunctions/createWebsite.html
Original file line number Diff line number Diff line change
Expand Up @@ -179,35 +179,26 @@ <h3 class="content-box-header">
<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">
Expand Down
7 changes: 3 additions & 4 deletions websiteFunctions/website.py
Original file line number Diff line number Diff line change
Expand Up @@ -2218,7 +2218,7 @@ def submitWebsiteCreation(self, userID=None, data=None):
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)

Expand Down Expand Up @@ -2319,8 +2319,7 @@ def submitDomainCreation(self, userID=None, data=None):
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)}'

Expand Down Expand Up @@ -4541,7 +4540,7 @@ def createWebsiteAPI(self, data=None):
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"
Expand Down

0 comments on commit ef85135

Please sign in to comment.