From 3f739cb968e432a2455596f780f56ccba3226c4a Mon Sep 17 00:00:00 2001 From: Giancarlo Panichi Date: Fri, 1 Jul 2022 19:08:13 +0200 Subject: [PATCH] Added teleworker --- README.md | 5 +++++ defaults/main.yml | 11 ++++++++--- templates/epas-docker-compose.yml.j2 | 5 +++++ 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index ecc2485..aa9239c 100644 --- a/README.md +++ b/README.md @@ -42,6 +42,11 @@ epas_pg_backups_volume: 'epas_db_data' psql_db_data: '{{ epas_psql_pg_data }}' # Environment epas_server_hostname: 'epas.example.com' +# Teleworker +epas_teleworker_server_active: True +epas_teleworker_server_baseurl: 'http://epasteleworker.isti.cnr.it:8080' +epas_teleworker_server_user: 'app.epas' +#epas_teleworker_server_password: 'set in a vault file' ## SMTP epas_smtp_server: 'localhost' epas_smtp_port: 587 diff --git a/defaults/main.yml b/defaults/main.yml index 030cd61..b71ae26 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -21,7 +21,7 @@ epas_db_host: 'postgres' epas_db_name: 'epas_prod_db' epas_db_allowed_hosts: - '127.0.0.1' -#epas_db_pwd: 'set it in a vault file' +#epas_db_pwd: 'use a vault file' epas_db_user: 'epas_prod_user' epas_docker_db_node: 'localhost' epas_db_volume: 'epas_prod_pg_data' @@ -34,7 +34,12 @@ epas_server_hostname: 'epas.example.com' epas_flows_enabled: False epas_attestati_url: 'https://attestativ2.rm.cnr.it' epas_attestati_user: '' -#epas_attestati_password: 'use a fault' +#epas_attestati_password: 'use a vault file' +# Teleworker +epas_teleworker_server_active: True +epas_teleworker_server_baseurl: 'http://epasteleworker.isti.cnr.it:8080' +epas_teleworker_server_user: 'app.epas' +#epas_teleworker_server_password: 'use a vault file' ## SMTP epas_smtp_server: 'localhost' epas_smtp_port: 587 @@ -43,7 +48,7 @@ epas_smtp_from: 'epas@cnr.it' epas_smtp_protocol: 'smtp' epas_smtp_authentication: True epas_smtp_user: '' -epas_smtp_password: 'use a vault file' +#epas_smtp_password: 'use a vault file' ## LDAP epas_ldap_login: 'false' epas_ldap_url: 'ldap://ldap.example.org:389' diff --git a/templates/epas-docker-compose.yml.j2 b/templates/epas-docker-compose.yml.j2 index ffd3ae7..46e79ec 100644 --- a/templates/epas-docker-compose.yml.j2 +++ b/templates/epas-docker-compose.yml.j2 @@ -44,6 +44,11 @@ services: - DB_PASS={{ epas_db_pwd }} # default: "non necessaria" - DB_PORT=5432 # default: 5432 - DB_USER={{ epas_db_user }} # default: postgres + #### Teleworker + - TELEWORK_ACTIVE={{ epas_teleworker_server_active }} # default: false + - TELEWORK_BASEURL={{ epas_teleworker_server_baseurl }} # default: http://teleworkerepas.isti.cnr.it:8080 + - TELEWORK_USER={{ epas_teleworker_server_user }} # default: app.epas + - TELEWORK_PASS={{ epas_teleworker_server_password }} # default: chiedere al team di sviluppo #### server SMTP #### - SMTP_HOST={{ epas_smtp_server }} # default: smtp.cnr.it - SMTP_PORT={{ epas_smtp_port }} # default: 25 se SMTP_CHANNEL รจ impostato clear o starttls; 465 se impostato su ssl