diff --git a/docs/configuration.md b/docs/configuration.md index 2cda4c9..b9274c6 100644 --- a/docs/configuration.md +++ b/docs/configuration.md @@ -142,9 +142,10 @@ force_validation: # at validation successfully completed. Setting this value to True will force # Moonraker to perform validation. The default is False. supervisord_config_path: -# Path to the superrvisord config file. In case for multi supervisord instance -# running on single machine, the default '/var/run/supervisord.sock' is occupied -# by other services. +# Path to the supervisord config file. This is required when for multiple +# supervisord are instances running on single machine and the default +# '/var/run/supervisord.sock' is occupied by other services. +# The default is no path. ``` !!! Note diff --git a/moonraker/components/machine.py b/moonraker/components/machine.py index 57dbb31..c91f098 100644 --- a/moonraker/components/machine.py +++ b/moonraker/components/machine.py @@ -109,7 +109,7 @@ class Machine: "none": BaseProvider, "systemd_cli": SystemdCliProvider, "systemd_dbus": SystemdDbusProvider, - "supervisord": SuperisordProvider + "supervisord": SupervisordProvider } self.provider_type = config.get('provider', 'systemd_dbus') pclass = providers.get(self.provider_type) @@ -1175,7 +1175,7 @@ class SystemdDbusProvider(BaseProvider): # for docker klipper-moonraker image multi-service managing # since in container, all command is launched by normal user, # sudo_cmd is not needed. -class SuperisordProvider(BaseProvider): +class SupervisordProvider(BaseProvider): def __init__(self, config: ConfigHelper) -> None: super().__init__(config) self.spv_conf: str = config.get("supervisord_config_path", "") @@ -1225,7 +1225,7 @@ class SuperisordProvider(BaseProvider): os.path.exists("/.dockerinit") ): virt_id = "docker" - virt_type = "docker" + virt_type = "container" return { 'virt_type': virt_type, 'virt_identifier': virt_id