Merge branch 'v2.3.5-dev' of https://github.com/usmannasir/cyberpanel …

…into v2.3.5-dev
usmannasir · Dec 20, 2023 · 0ee01e1 · 0ee01e1
2 parents c46ab40 + 7900bec
commit 0ee01e1
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 5 deletions.
diff --git a/dockerManager/models.py b/dockerManager/models.py
@@ -15,4 +15,4 @@ class Containers(models.Model):
     ports = models.TextField(default="{}")
     volumes = models.TextField(default="{}")
     env = models.TextField(default="{}")
-    startOnReboot = models.IntegerField(default=0)
+    startOnReboot = models.IntegerField(default=0)
diff --git a/plogical/DockerSites.py b/plogical/DockerSites.py
@@ -527,7 +527,7 @@ def Main():
                 "adminPassword": 'testdbwp',
                 "adminEmail": '[email protected]',
                 "htaccessPath": '/home/docker.cyberpanel.net/public_html/.htaccess',
-                "externalApp": 'docke3339',
+                "externalApp": 'docke8463',
                 "docRoot": "/home/docker.cyberpanel.net"
             }
             ds = Docker_Sites(data)

diff --git a/websiteFunctions/templates/websiteFunctions/createDomain.html b/websiteFunctions/templates/websiteFunctions/createDomain.html
@@ -184,8 +184,15 @@ <h3 class="content-box-header">
                             <div class="col-sm-9">
                                 <div class="checkbox">
                                     <label>
-                                        <input ng-model="apacheBackend" type="checkbox" value="">
-                                        Apache as Reverse Proxy (Beta, for Ubuntu 22 and AlmaLinux 8)
+                                        {% if test_domain_data %}
+                                            <input ng-model="apacheBackend" type="checkbox" value="">
+                                            Apache as Reverse Proxy (Beta, for Ubuntu 22 and AlmaLinux 8)
+                                        {% else %}
+                                            <input ng-model="apacheBackend" type="checkbox" value="" disabled>
+                                            OpenLiteSpeed + Apache (Backend) (For Ubuntu 22 and AlmaLinux 8) -
+                                            <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>

diff --git a/websiteFunctions/templates/websiteFunctions/createWebsite.html b/websiteFunctions/templates/websiteFunctions/createWebsite.html
@@ -157,7 +157,6 @@ <h3 class="content-box-header">
                                             <input ng-model="apacheBackend" type="checkbox" value="">
                                             OpenLiteSpeed + Apache (Backend) (For Ubuntu 22 and AlmaLinux 8)
                                         {% else %}
-
                                             <input ng-model="apacheBackend" type="checkbox" value="" disabled>
                                             OpenLiteSpeed + Apache (Backend) (For Ubuntu 22 and AlmaLinux 8) - <strong><a href="https://go.cyberpanel.net/ApacheRev">Premium Feature</a> <i class="p fa fa-external-link btn-icon"> </i></strong>
                                         {% endif %}