Browse Source

[Controller] Add HTTPS_PORT env var to base_url

FreddleSpl0it 2 weeks ago
parent
commit
fed3fc9514

+ 1 - 1
data/Dockerfiles/controller/mailcow-adm/modules/Mailcow.py

@@ -15,7 +15,7 @@ class Mailcow:
         self.apiUrl = "/api/v1"
         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.apiKey = ""
         if self.ignore_ssl_errors:

+ 1 - 1
data/Dockerfiles/controller/mailcow-adm/modules/Sogo.py

@@ -11,7 +11,7 @@ class Sogo:
         self.davUrl = "/SOGo/dav"
         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", "")
         if self.ignore_ssl_errors:
             urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)

+ 1 - 1
docker-compose.yml

@@ -579,7 +579,7 @@ services:
         - ${IPV4_NETWORK:-172.22.1}.254
       environment:
         - MAILCOW_HOSTNAME=${MAILCOW_HOSTNAME}
-        - API_KEY=${API_KEY:-invalid}
+        - HTTPS_PORT=${HTTPS_PORT:-443}
         - TZ=${TZ}
         - DBNAME=${DBNAME}
         - DBUSER=${DBUSER}