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

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

Browse Source
This commit is contained in:
Hassan Hashmi
2023-12-20 16:01:12 +05:00
parent c46ab40f68 7900beced5
commit 0ee01e159f
4 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dockerManager/models.py
View File

@@ -15,4 +15,4 @@ class Containers(models.Model):
ports = models.TextField(default="{}") ports = models.TextField(default="{}")
volumes = models.TextField(default="{}") volumes = models.TextField(default="{}")
env = models.TextField(default="{}") env = models.TextField(default="{}")
startOnReboot = models.IntegerField(default=0) startOnReboot = models.IntegerField(default=0)

2
plogical/DockerSites.py
View File

@@ -527,7 +527,7 @@ def Main():
"adminPassword": 'testdbwp', "adminPassword": 'testdbwp',
"adminEmail": 'usman@cyberpersons.com', "adminEmail": 'usman@cyberpersons.com',
"htaccessPath": '/home/docker.cyberpanel.net/public_html/.htaccess', "htaccessPath": '/home/docker.cyberpanel.net/public_html/.htaccess',
"externalApp": 'docke3339', "externalApp": 'docke8463',
"docRoot": "/home/docker.cyberpanel.net" "docRoot": "/home/docker.cyberpanel.net"
} }
ds = Docker_Sites(data) ds = Docker_Sites(data)

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

@@ -184,8 +184,15 @@
<div class="col-sm-9"> <div class="col-sm-9">
<div class="checkbox"> <div class="checkbox">
<label> <label>
<input ng-model="apacheBackend" type="checkbox" value=""> {% if test_domain_data %}
Apache as Reverse Proxy (Beta, for Ubuntu 22 and AlmaLinux 8) <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> </label>
</div> </div>
</div> </div>

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

@@ -157,7 +157,6 @@
<input ng-model="apacheBackend" type="checkbox" value=""> <input ng-model="apacheBackend" type="checkbox" value="">
OpenLiteSpeed + Apache (Backend) (For Ubuntu 22 and AlmaLinux 8) OpenLiteSpeed + Apache (Backend) (For Ubuntu 22 and AlmaLinux 8)
{% else %} {% else %}
<input ng-model="apacheBackend" type="checkbox" value="" disabled> <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> 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 %} {% endif %}