mirror of
https://github.com/mailcow/mailcow-dockerized.git
synced 2026-10-12 12:32:35 +00:00
[Controller] Add HTTPS_PORT env var to base_url
This commit is contained in:
@@ -15,7 +15,7 @@ class Mailcow:
|
|||||||
self.apiUrl = "/api/v1"
|
self.apiUrl = "/api/v1"
|
||||||
self.ignore_ssl_errors = True
|
self.ignore_ssl_errors = True
|
||||||
|
|
||||||
self.baseUrl = f"https://{os.getenv('IPv4_NETWORK', '172.22.1')}.247"
|
self.baseUrl = f"https://{os.getenv('IPv4_NETWORK', '172.22.1')}.247:{os.getenv('HTTPS_PORT', '443')}"
|
||||||
self.host = os.getenv("MAILCOW_HOSTNAME", "")
|
self.host = os.getenv("MAILCOW_HOSTNAME", "")
|
||||||
self.apiKey = ""
|
self.apiKey = ""
|
||||||
if self.ignore_ssl_errors:
|
if self.ignore_ssl_errors:
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ class Sogo:
|
|||||||
self.davUrl = "/SOGo/dav"
|
self.davUrl = "/SOGo/dav"
|
||||||
self.ignore_ssl_errors = True
|
self.ignore_ssl_errors = True
|
||||||
|
|
||||||
self.baseUrl = f"https://{os.getenv('IPv4_NETWORK', '172.22.1')}.247"
|
self.baseUrl = f"https://{os.getenv('IPv4_NETWORK', '172.22.1')}.247:{os.getenv('HTTPS_PORT', '443')}"
|
||||||
self.host = os.getenv("MAILCOW_HOSTNAME", "")
|
self.host = os.getenv("MAILCOW_HOSTNAME", "")
|
||||||
if self.ignore_ssl_errors:
|
if self.ignore_ssl_errors:
|
||||||
urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
|
urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
|
||||||
|
|||||||
+1
-1
@@ -579,7 +579,7 @@ services:
|
|||||||
- ${IPV4_NETWORK:-172.22.1}.254
|
- ${IPV4_NETWORK:-172.22.1}.254
|
||||||
environment:
|
environment:
|
||||||
- MAILCOW_HOSTNAME=${MAILCOW_HOSTNAME}
|
- MAILCOW_HOSTNAME=${MAILCOW_HOSTNAME}
|
||||||
- API_KEY=${API_KEY:-invalid}
|
- HTTPS_PORT=${HTTPS_PORT:-443}
|
||||||
- TZ=${TZ}
|
- TZ=${TZ}
|
||||||
- DBNAME=${DBNAME}
|
- DBNAME=${DBNAME}
|
||||||
- DBUSER=${DBUSER}
|
- DBUSER=${DBUSER}
|
||||||
|
|||||||
Reference in New Issue
Block a user