diff --git a/imageroot/actions/configure-module/20setenvs b/imageroot/actions/configure-module/20setenvs index b29ada070..4eecf7a8d 100755 --- a/imageroot/actions/configure-module/20setenvs +++ b/imageroot/actions/configure-module/20setenvs @@ -39,6 +39,7 @@ getFromRequest(request, 'nethcti_log_level', 'NETHCTI_LOG_LEVEL', 'warn') getFromRequest(request, 'conference_jitsi_url', 'CONFERENCE_JITSI_URL', 'https://jitsi.nethserver.net') getFromRequest(request, 'app_brand_id', 'BRAND_APPID', '') getFromRequest(request, 'flexisip_log_level', 'FLEXISIP_LOG_LEVEL', 'warning') +getFromRequest(request, 'timezone', 'TIMEZONE', 'UTC') ## NethCTI UI getFromRequest(request, 'nethcti_ui_host', 'NETHCTI_UI_HOST', '') diff --git a/imageroot/actions/configure-module/validate-input.json b/imageroot/actions/configure-module/validate-input.json index 3970524cb..cc37a9b0a 100644 --- a/imageroot/actions/configure-module/validate-input.json +++ b/imageroot/actions/configure-module/validate-input.json @@ -198,6 +198,10 @@ "reports_ui_company_name": { "description": "Company name of the reports UI app.", "type": "string" + }, + "timezone": { + "description": "Asterisk Timezone for timeconditions", + "type": "string" } } } diff --git a/imageroot/actions/get-configuration/20read b/imageroot/actions/get-configuration/20read index ad6288bb2..617e56870 100755 --- a/imageroot/actions/get-configuration/20read +++ b/imageroot/actions/get-configuration/20read @@ -15,6 +15,7 @@ config = { 'nethvoice_host': os.getenv('NETHVOICE_HOST', ''), 'nethcti_ui_host': os.getenv('NETHCTI_UI_HOST', ''), 'lets_encrypt': os.getenv('TRAEFIK_LETS_ENCRYPT') == 'True', + 'timezone': os.getenv('TIMEZONE', 'UTC'), 'user_domain': os.getenv('USER_DOMAIN', ''), 'reports_international_prefix': os.getenv('REPORTS_INTERNATIONAL_PREFIX', '') } diff --git a/imageroot/actions/get-configuration/validate-output.json b/imageroot/actions/get-configuration/validate-output.json index cee3a7374..85967b2a4 100644 --- a/imageroot/actions/get-configuration/validate-output.json +++ b/imageroot/actions/get-configuration/validate-output.json @@ -18,6 +18,10 @@ "description": "Enable Let's Encrypt certificate", "type": "boolean" }, + "timezone": { + "description": "Timezone for the Nethvoice instance", + "type": "string" + }, "user_domain": { "description": "Domain where the user accessing Nethvoice are stored", "type": "string" diff --git a/imageroot/systemd/user/asterisk.service b/imageroot/systemd/user/asterisk.service index d956e53e7..ff734496b 100644 --- a/imageroot/systemd/user/asterisk.service +++ b/imageroot/systemd/user/asterisk.service @@ -37,6 +37,7 @@ ExecStart=/usr/bin/podman run \ --env=NETHVOICE* \ --env=ASTERISK_* \ --network=host \ + --tz=TIMEZONE \ ${NETHVOICE_ASTERISK_IMAGE} # Wait till asterisk is active