Revert "feat: move get_subdomain to parent class really"

This reverts commit 4eaefc8321.
This commit is contained in:
Inex Code 2024-06-26 14:21:58 +03:00
parent 8bb9166287
commit c42e2ef3ac
2 changed files with 11 additions and 5 deletions

View file

@ -44,6 +44,14 @@ class Roundcube(Service):
subdomain = get_subdomain()
return f"https://{subdomain}.{domain}"
@staticmethod
def get_subdomain() -> Optional[str]:
with ReadUserData() as data:
if "roundcube" in data["modules"]:
return data["modules"]["roundcube"]["subdomain"]
return "webmail"
@staticmethod
def is_movable() -> bool:
return False

View file

@ -1,5 +1,4 @@
"""Abstract class for a service running on a server"""
from abc import ABC, abstractmethod
from typing import List, Optional
@ -74,14 +73,13 @@ class Service(ABC):
"""
pass
@staticmethod
@abstractmethod
def get_subdomain() -> Optional[str]:
"""
The assigned primary subdomain for this service.
"""
with ReadUserData() as data:
if self.get_display_name() in data["modules"]:
if "subdomain" in data["modules"][self.get_display_name()]:
return data["modules"][self.get_display_name()]["subdomain"]
pass
@classmethod
def get_user(cls) -> Optional[str]: