speed up the process of download for wp backups

usmannasir · Oct 2, 2024 · e2bf28e · e2bf28e
1 parent 37d51ae
commit e2bf28e
Show file tree

Hide file tree

Showing 6 changed files with 185 additions and 72 deletions.
diff --git a/WebTerminal/CPWebSocket.py b/WebTerminal/CPWebSocket.py
@@ -28,7 +28,7 @@ def findSSHPort():
             sshData = ProcessUtilities.outputExecutioner('cat /etc/ssh/sshd_config').split('\n')
 
             for items in sshData:
-                if items.find('Port') > -1:
+                if items.find('Port') > -1 and items[0] != '#':
                     if items[0] == 0:
                         pass
                     else:

diff --git a/plogical/applicationInstaller.py b/plogical/applicationInstaller.py
diff --git a/websiteFunctions/templates/websiteFunctions/WPsiteHome.html b/websiteFunctions/templates/websiteFunctions/WPsiteHome.html
@@ -564,6 +564,13 @@ <h3 class="content-box-header">
                                     </h3>
                                     <div class="example-box-wrapper">
 
+                                        <div class="alert alert-warning">
+                                            <p>This feature will create a backup of your WordPress website. If you want
+                                                to schedule remote backups of your entire site, including email accounts
+                                                and DNS records, please <a
+                                                        href="/backup/OneClickBackups">click here.</a></p>
+                                        </div>
+
                                         <form name="websiteCreationForm" action="/" id="createPackages"
                                               class="form-horizontal bordered-row panel-body">
                                             <div ng-hide="installationDetailsForm" class="form-group">

diff --git a/websiteFunctions/templates/websiteFunctions/createDomain.html b/websiteFunctions/templates/websiteFunctions/createDomain.html
@@ -197,15 +197,15 @@ <h3 class="content-box-header">
 
                             <div ng-hide="DomainCreateForm" ng-hide="installationDetailsForm"
                                  class="form-group">
-                                <label class="col-sm-3 control-label">{% trans "Additional Features" %}</label>
-                                <div class="col-sm-9">
-                                    <div class="checkbox">
-                                        <label>
-                                            <input ng-model="sslCheck" type="checkbox" value="">
-                                            SSL
-                                        </label>
-                                    </div>
-                                </div>
+{#                                <label class="col-sm-3 control-label">{% trans "Additional Features" %}</label>#}
+{#                                <div class="col-sm-9">#}
+{#                                    <div class="checkbox">#}
+{#                                        <label>#}
+{#                                            <input ng-model="sslCheck" type="checkbox" value="">#}
+{#                                            SSL#}
+{#                                        </label>#}
+{#                                    </div>#}
+{#                                </div>#}
                                 <label class="col-sm-3 control-label"></label>
                                 <div class="col-sm-9">
                                     <div class="checkbox">

diff --git a/websiteFunctions/templates/websiteFunctions/createWebsite.html b/websiteFunctions/templates/websiteFunctions/createWebsite.html
@@ -164,15 +164,15 @@ <h3 class="content-box-header">
                         </div>
 
                         <div ng-hide="installationDetailsForm" class="form-group">
-                            <label class="col-sm-3 control-label">{% trans "Additional Features" %}</label>
-                            <div class="col-sm-9">
-                                <div class="checkbox">
-                                    <label>
-                                        <input ng-model="sslCheck" type="checkbox" value="">
-                                        SSL
-                                    </label>
-                                </div>
-                            </div>
+{#                            <label class="col-sm-3 control-label">{% trans "Additional Features" %}</label>#}
+{#                            <div class="col-sm-9">#}
+{#                                <div class="checkbox">#}
+{#                                    <label>#}
+{#                                        <input ng-model="sslCheck" type="checkbox" value="">#}
+{#                                        SSL#}
+{#                                    </label>#}
+{#                                </div>#}
+{#                            </div>#}
                             <label class="col-sm-3 control-label"></label>
                             <div class="col-sm-9">
                                 <div class="checkbox">

diff --git a/websiteFunctions/website.py b/websiteFunctions/website.py
@@ -2224,7 +2224,7 @@ def submitWebsiteCreation(self, userID=None, data=None):
             execPath = "/usr/local/CyberCP/bin/python " + virtualHostUtilities.cyberPanel + "/plogical/virtualHostUtilities.py"
             execPath = execPath + " createVirtualHost --virtualHostName " + domain + \
                        " --administratorEmail " + adminEmail + " --phpVersion '" + phpSelection + \
-                       "' --virtualHostUser " + externalApp + " --ssl " + str(data['ssl']) + " --dkimCheck " \
+                       "' --virtualHostUser " + externalApp + " --ssl " + str(1) + " --dkimCheck " \
                        + str(1) + " --openBasedir " + str(data['openBasedir']) + \
                        ' --websiteOwner "' + websiteOwner + '" --package "' + packageName + '" --tempStatusPath ' + tempStatusPath + " --apache " + apacheBackend + " --mailDomain %s" % (
                            mailDomain)
@@ -2326,7 +2326,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(1) \
+                       " --phpVersion '" + phpSelection + "' --ssl " + str(1) + " --dkimCheck " + str(1) \
                        + " --openBasedir " + str(data['openBasedir']) + ' --path ' + path + ' --websiteOwner ' \
                        + admin.userName + ' --tempStatusPath ' + tempStatusPath + " --apache " + apacheBackend + f' --aliasDomain {str(alias)}'