mirror of
https://gitlab.com/crafty-controller/crafty-4.git
synced 2024-08-30 18:23:09 +00:00
Merge branch 'dev' into lang/italian-updates
This commit is contained in:
commit
34c30f7552
@ -5,7 +5,8 @@ TBD
|
||||
### Bug fixes
|
||||
TBD
|
||||
### Tweaks
|
||||
TBD
|
||||
- Clean up remaining http handler references ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/733))
|
||||
- Remove version disclosure on login page ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/737))
|
||||
### Lang
|
||||
TBD
|
||||
<br><br>
|
||||
|
@ -9,7 +9,6 @@ from app.classes.web.base_api_handler import BaseApiHandler
|
||||
config_json_schema = {
|
||||
"type": "object",
|
||||
"properties": {
|
||||
"http_port": {"type": "integer"},
|
||||
"https_port": {"type": "integer"},
|
||||
"language": {
|
||||
"type": "string",
|
||||
|
@ -98,7 +98,6 @@ class Webserver:
|
||||
# let's verify we have an SSL cert
|
||||
self.helper.create_self_signed_cert()
|
||||
|
||||
http_port = self.helper.get_setting("http_port")
|
||||
https_port = self.helper.get_setting("https_port")
|
||||
|
||||
debug_errors = self.helper.get_setting("show_errors")
|
||||
@ -110,9 +109,6 @@ class Webserver:
|
||||
cookie_secret = self.helper.random_string_generator(32)
|
||||
HelpersManagement.set_cookie_secret(cookie_secret)
|
||||
|
||||
if not http_port and http_port != 0:
|
||||
http_port = 8000
|
||||
|
||||
if not https_port:
|
||||
https_port = 8443
|
||||
|
||||
@ -125,7 +121,7 @@ class Webserver:
|
||||
),
|
||||
}
|
||||
|
||||
logger.info(f"Starting Web Server on ports http:{http_port} https:{https_port}")
|
||||
logger.info(f"Starting Web Server on ports https:{https_port}")
|
||||
|
||||
asyncio.set_event_loop(asyncio.new_event_loop())
|
||||
|
||||
|
@ -111,8 +111,7 @@
|
||||
</div>
|
||||
|
||||
<div class="text-block text-center my-3">
|
||||
<span class="text-small font-weight-semibold"><a href="https://craftycontrol.com/">Crafty Control
|
||||
{{data['version'] }}</a> </span>
|
||||
<span class="text-small font-weight-semibold"><a href="https://craftycontrol.com/">Crafty Control</a> </span>
|
||||
</div>
|
||||
|
||||
<div class="text-block text-center my-3">
|
||||
|
Loading…
Reference in New Issue
Block a user