Merge pull request #32 from NethServer/fixEjabberdEnv

Update ejabberd_module environment variable in webtop.py NethServer/dev#6828
NethServer · Jan 17, 2024 · 308b994 · 308b994
2 parents 148cf1a + e49d4ae
commit 308b994
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/imageroot/actions/create-module/10env b/imageroot/actions/create-module/10env
@@ -18,3 +18,4 @@ agent.set_env('Z_PUSH_USE_LEGACY_FOLDER_IDS', 'false')
 agent.set_env('WEBAPP_JS_DEBUG', 'False')
 agent.set_env('WEBAPP_MIN_MEMORY', '512')
 agent.set_env('WEBAPP_MAX_MEMORY', '1024')
+agent.set_env('EJABBERD_MODULE', '')
diff --git a/imageroot/pypkg/webtop.py b/imageroot/pypkg/webtop.py
@@ -15,7 +15,7 @@ def configure_module(mail_module, penv):
         "locale": penv['WEBTOP_LOCALE'],
         "timezone": penv['WEBTOP_TIMEZONE'],
         "mail_module": mail_module,
-        "ejabberd_module": penv['EJABBERD_MODULE'],
+        "ejabberd_module": penv.get('EJABBERD_MODULE',''),
         "webapp": {
             "debug": penv['WEBAPP_JS_DEBUG'] == 'True',
             "min_memory": int(penv['WEBAPP_MIN_MEMORY']),