evgeny/modoboa-installer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Deploy supervisor config for new RQ worker

Browse Source
This commit is contained in:
Antoine Nguyen
2023-12-22 16:43:33 +01:00
parent b7f378fc63
commit 7097e15ae9
3 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
modoboa_installer/scripts/files/modoboa/supervisor-rq-base.tpl Normal file
View File

@@ -0,0 +1,9 @@
[program:modoboa-base-worker]
autostart=true
autorestart=true
command=%{venv_path}/bin/python %{home_dir}/instance/manage.py rqworker modoboa
directory=%{home_dir}
user=%{user}
redirect_stderr=true
numprocs=1
stopsignal=TERM

0
modoboa_installer/scripts/files/modoboa/supervisor-rq.tpl → modoboa_installer/scripts/files/modoboa/supervisor-rq-dkim.tpl
View File

10
modoboa_installer/scripts/modoboa.py
View File

@@ -44,7 +44,7 @@ class Modoboa(base.Installer):
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
"""Get configuration.""" """Get configuration."""
super(Modoboa, self).__init__(*args, **kwargs) super().__init__(*args, **kwargs)
self.venv_path = self.config.get("modoboa", "venv_path") self.venv_path = self.config.get("modoboa", "venv_path")
self.instance_path = self.config.get("modoboa", "instance_path") self.instance_path = self.config.get("modoboa", "instance_path")
self.extensions = self.config.get("modoboa", "extensions").split() self.extensions = self.config.get("modoboa", "extensions").split()
@@ -194,7 +194,7 @@ class Modoboa(base.Installer):
def setup_database(self): def setup_database(self):
"""Additional config.""" """Additional config."""
super(Modoboa, self).setup_database() super().setup_database()
if not self.amavis_enabled: if not self.amavis_enabled:
return return
self.backend.grant_access( self.backend.grant_access(
@@ -202,7 +202,7 @@ class Modoboa(base.Installer):
def get_packages(self): def get_packages(self):
"""Include extra packages if needed.""" """Include extra packages if needed."""
packages = super(Modoboa, self).get_packages() packages = super().get_packages()
condition = ( condition = (
package.backend.FORMAT == "rpm" and package.backend.FORMAT == "rpm" and
sys.version_info.major == 2 and sys.version_info.major == 2 and
@@ -228,7 +228,9 @@ class Modoboa(base.Installer):
# Add worker for dkim if needed # Add worker for dkim if needed
if self.modoboa_2_2_or_greater: if self.modoboa_2_2_or_greater:
config_files.append( config_files.append(
"supervisor-rq=/etc/supervisor/conf.d/modoboa-worker.conf") "supervisor-rq-dkim=/etc/supervisor/conf.d/modoboa-dkim-worker.conf")
config_files.append(
"supervisor-rq-base=/etc/supervisor/conf.d/modoboa-base-worker.conf")
return config_files return config_files
def get_template_context(self): def get_template_context(self):