diff --git a/imageroot/actions/configure-module/20setenvs b/imageroot/actions/configure-module/20setenvs index b29ada070..2ad18e68f 100755 --- a/imageroot/actions/configure-module/20setenvs +++ b/imageroot/actions/configure-module/20setenvs @@ -21,6 +21,7 @@ def getFromRequest(request, var_name, env_name, default = ""): # NETHVOICE_HOST_LOCAL_NETWORKS should be a jason containing local networks [{"network":"192.168.5.0","netmask":"255.255.255.0","gateway":"192.168.5.1"}] getFromRequest(request, 'nethvoice_host_local_networks', 'NETHVOICE_HOST_LOCAL_NETWORKS', '{[]}') getFromRequest(request, 'nethvoice_host', 'NETHVOICE_HOST', '') +getFromRequest(request, 'nethvoice_admin_password', 'NETHVOICE_ADMIN_PASSWORD', '') getFromRequest(request, 'subscription_systemid', 'SUBSCRIPTION_SYSTEMID', '') getFromRequest(request, 'subscription_secret', 'SUBSCRIPTION_SECRET', '') getFromRequest(request, 'nethcti_prefix', 'NETHCTI_PREFIX', '') diff --git a/imageroot/actions/configure-module/validate-input.json b/imageroot/actions/configure-module/validate-input.json index 3970524cb..c8d3f4106 100644 --- a/imageroot/actions/configure-module/validate-input.json +++ b/imageroot/actions/configure-module/validate-input.json @@ -69,6 +69,10 @@ "type": "string", "format": "hostname" }, + "nethvoice_admin_password": { + "description": "NethVoice admin password to access user interface", + "type": "string" + }, "nethcti_prefix": { "description": "NethCTI Prefix", "type": "string" diff --git a/imageroot/actions/get-configuration/20read b/imageroot/actions/get-configuration/20read index ad6288bb2..c0c9b5c05 100755 --- a/imageroot/actions/get-configuration/20read +++ b/imageroot/actions/get-configuration/20read @@ -13,6 +13,7 @@ import agent config = { 'nethvoice_host': os.getenv('NETHVOICE_HOST', ''), + 'nethvoice_admin_password': os.getenv('NETHVOICE_ADMIN_PASSWORD', ''), 'nethcti_ui_host': os.getenv('NETHCTI_UI_HOST', ''), 'lets_encrypt': os.getenv('TRAEFIK_LETS_ENCRYPT') == 'True', 'user_domain': os.getenv('USER_DOMAIN', ''), diff --git a/imageroot/actions/get-configuration/validate-output.json b/imageroot/actions/get-configuration/validate-output.json index cee3a7374..a37c14646 100644 --- a/imageroot/actions/get-configuration/validate-output.json +++ b/imageroot/actions/get-configuration/validate-output.json @@ -10,6 +10,10 @@ "description": "Host where nethvoice instance should be exposed to", "type": "string" }, + "nethvoice_admin_password": { + "description": "NethVoice admin password to access user interface", + "type": "string" + }, "nethcti_ui_host": { "description": "CTI host, must be different than nethvoice_host", "type": "string" diff --git a/imageroot/actions/restore-module/70configure_module b/imageroot/actions/restore-module/70configure_module index f580de2fd..7f124ea23 100755 --- a/imageroot/actions/restore-module/70configure_module +++ b/imageroot/actions/restore-module/70configure_module @@ -18,6 +18,7 @@ old_envs = request['environment'] # call configure module response = agent.tasks.run(agent_id=os.environ['AGENT_ID'], action='configure-module', data={ "nethvoice_host": old_envs["NETHVOICE_HOST"], + "nethvoice_admin_password": old_envs["NETHVOICE_ADMIN_PASSWORD"], "nethcti_ui_host": old_envs["NETHCTI_UI_HOST"], "lets_encrypt": old_envs["TRAEFIK_LETS_ENCRYPT"] == 'true', "reports_international_prefix": old_envs["REPORTS_INTERNATIONAL_PREFIX"], diff --git a/ui/public/i18n/en/translation.json b/ui/public/i18n/en/translation.json index 7f2f05478..f032a9503 100644 --- a/ui/public/i18n/en/translation.json +++ b/ui/public/i18n/en/translation.json @@ -36,6 +36,7 @@ "lets_encrypt": "Request Let's Encrypt certificate", "nethcti_ui_host": "NethCTI UI base host", "nethvoice_host": "NethVoice base host", + "nethvoice_admin_password": "NethVoice admin password to access user interface", "save": "Save", "title": "Settings", "user_domain": "User Domain", diff --git a/ui/public/i18n/it/translation.json b/ui/public/i18n/it/translation.json index 7211e6802..e415d7670 100644 --- a/ui/public/i18n/it/translation.json +++ b/ui/public/i18n/it/translation.json @@ -37,6 +37,7 @@ "lets_encrypt": "Richiedi certificato Let's Encrypt", "nethcti_ui_host": "Host base di NethCTI", "nethvoice_host": "Host base di NethVoice", + "nethvoice_admin_password": "Password di admin di NethVoice per accedere all'interfaccia", "save": "Salva", "title": "Impostazioni", "user_domain": "Host Dominio Utenti", diff --git a/ui/public/metadata.json b/ui/public/metadata.json index 997ad91e7..6f6b02ea1 100644 --- a/ui/public/metadata.json +++ b/ui/public/metadata.json @@ -13,7 +13,7 @@ ], "docs": { "documentation_url": "https://github.com/nethesis/ns8-nethvoice", - "bug_url": "https://github.com/NethServer/dev", + "bug_url": "https://github.com/nethesis/dev", "code_url": "https://github.com/nethesis/ns8-nethvoice" }, "source": "ghcr.io/nethesis/nethvoice" diff --git a/ui/src/views/Settings.vue b/ui/src/views/Settings.vue index ddfbab4df..84a85cbfe 100644 --- a/ui/src/views/Settings.vue +++ b/ui/src/views/Settings.vue @@ -39,6 +39,14 @@ :invalid-message="error.nethcti_ui_host" ref="nethcti_ui_host" /> +