diff --git a/group_vars/connect/plain.yml b/group_vars/connect/plain.yml index 4a5640a..ff6d8cf 100644 --- a/group_vars/connect/plain.yml +++ b/group_vars/connect/plain.yml @@ -2,7 +2,12 @@ service: "connect" -connect_version: '8.2.0-SMARCH-56-1-SNAPSHOT' +connect_process_search_module: "external" +connect_loglevel_message_queue: "DEBUG" +connect_loglevel_document_index: "DEBUG" +connect_loglevel_workflow_index: "DEBUG" +connect_loglevel_workflow_analysis: "DEBUG" +connect_image_version: "8.3.0-SMARCH-70-1-SNAPSHOT" hetzner_server_type: cx21 hetzner_server_labels: "stage={{ stage }} service={{ service }}" @@ -66,6 +71,9 @@ connect_iam_user_management_url: "https://{{ shared_service_keycloak_hostname }} connect_jwt_enabled: true connect_jwt_secret: 908ae14462d049d3be84964ef379c7c6 +# TODO shouldn't be here at all -> currently the connect service needs knowlegde of the webdav secret -> smells like hell! +webdav_jwt_secret: "5646aee6dadc4c19b15f4b65f1e6549f" + #connect_csrf_token_name: "< see vault >" #connect_csrf_token_value: "< see vault >" diff --git a/group_vars/stage_dev/plain.yml b/group_vars/stage_dev/plain.yml index bae4126..6ac1478 100644 --- a/group_vars/stage_dev/plain.yml +++ b/group_vars/stage_dev/plain.yml @@ -6,16 +6,17 @@ alertmanager_channel_smardigo: "#monitoring-qa" # TODO read configuration with hetzner rest api shared_service_network: "10.0.0.0/16" +shared_service_awx_ip: "10.0.0.10" +shared_service_docker_ip: "10.0.0.7" shared_service_elastic_01: "10.0.0.2" shared_service_elastic_02: "10.0.0.3" shared_service_elastic_03: "10.0.0.4" -shared_service_awx_ip: "10.0.0.10" -shared_service_docker_ip: "10.0.0.7" shared_service_iam_ip: "10.0.0.13" shared_service_keycloak_ip: "10.0.0.6" shared_service_mail_ip: "10.0.0.8" shared_service_pg_master_ip: "10.0.0.17" shared_service_pg_slave_ip: "10.0.0.18" +shared_service_webdav_ip: "10.0.0.16" shared_service_awx_hostname: "dev-awx-01.smardigo.digital" shared_service_docker_registry_hostname: "dev-docker-registry-01.smardigo.digital" @@ -24,6 +25,7 @@ shared_service_keycloak_hostname: "dev-keycloak-01.smardigo.digital" shared_service_mail_hostname: "dev-mail-01.smardigo.digital" shared_service_pg_master_hostname: "dev-postgres-01.smardigo.digital" shared_service_pg_slave_hostname: "dev-postgres-02.smardigo.digital" +shared_service_webdav_hostname: "dev-webdav-01.smardigo.digital" shared_service_hosts: [ { @@ -57,6 +59,10 @@ shared_service_hosts: [ { ip: "{{ shared_service_pg_slave_ip }}", name: "{{ shared_service_pg_slave_hostname }}" + }, + { + ip: "{{ shared_service_webdav_ip }}", + name: "{{ shared_service_webdav_hostname }}" } ] diff --git a/roles/connect/vars/main.yml b/roles/connect/vars/main.yml index e56bc3f..4abcc61 100644 --- a/roles/connect/vars/main.yml +++ b/roles/connect/vars/main.yml @@ -34,6 +34,12 @@ connect_environment: [ "ADMIN_LOGIN: \"{{ connect_admin_username }}\"", "ADMIN_PASSWORD: \"{{ connect_admin_password }}\"", + "SMA_JWT_ENABLED: \"{{ connect_jwt_enabled | default('false') }}\"", + "SMA_JWT_SECRET: \"{{ connect_jwt_secret | default('') }}\"", + "SMA_CSRF_TOKEN_NAME: \"{{ connect_csrf_token_name | default('') }}\"", + "SMA_CSRF_TOKEN_VALUE: \"{{ connect_csrf_token_value | default('') }}\"", + "SPRING_PROFILES_INCLUDE: \"{{ spring_profiles_include | default('swagger') }}\"", + "RIBBON_DISPLAY_ON_ACTIVE_PROFILES: \"{{ ribbon_display_on_active_profiles | default('dev') }}\"", "DATASOURCE_URL: \"jdbc:postgresql://{{ connect_postgres_host }}:{{ service_port_postgres }}/{{ connect_postgres_database_name }}\"", "DATASOURCE_USERNAME: \"{{ connect_postgres_admin_username }}\"", @@ -63,13 +69,7 @@ connect_environment: [ "IAM_CLIENT_ENABLED: \"{{ smardigo_iam_client_enabled | default('false') }}\"", "EXTERNAL_IAM_SERVER_URL: \"{{ smardigo_iam_client_server_url | default('') }}\"", - "SPRING_PROFILES_INCLUDE: \"{{ spring_profiles_include | default('swagger') }}\"", - "RIBBON_DISPLAY_ON_ACTIVE_PROFILES: \"{{ ribbon_display_on_active_profiles | default('dev') }}\"", - - "SMA_JWT_ENABLED: \"{{ connect_jwt_enabled | default('false') }}\"", - "SMA_JWT_SECRET: \"{{ connect_jwt_secret | default('') }}\"", - "SMA_CSRF_TOKEN_NAME: \"{{ connect_csrf_token_name | default('') }}\"", - "SMA_CSRF_TOKEN_VALUE: \"{{ connect_csrf_token_value | default('') }}\"", + "PROCESS_SEARCH_MODULE: \"{{ connect_process_search_module | default('embedded') }}\"", "ELASTIC_HOST: \"{{ connect_elastic_host | default('') }}\"", "ELASTIC_PREFIX: \"{{ connect_elastic_prefix }}\"", @@ -79,6 +79,12 @@ connect_environment: [ "ELASTIC_SEARCH_INDEX: \"{{ connect_elastic_search_index | default('search') }}\"", "ELASTIC_MESSAGE_INDEX: \"{{ connect_elastic_message_index | default('message') }}\"", "ELASTIC_ANALYSIS_INDEX: \"{{ connect_elastic_analysis_index | default('analysis') }}\"", + + "SMA_ENABLE_WEBDAV_DOC_EDITING: \"true\"", + "SMA_WEBDAV_BASE_PATH: \"https://{{ shared_service_webdav_hostname }}\"", + "SMA_WEBDAV_HOST_URL: \"https://{{ shared_service_webdav_hostname }}/\"", + "SMA_WEBDAV_FRONTEND_URL: \"https://{{ shared_service_webdav_hostname }}.smardigo.digital/\"", + "SMA_WEBDAV_JWT_SECRET: \"{{ webdav_jwt_secret }}\"", "LOG_LEVEL_MESSAGE_QUEUE: \"{{ connect_loglevel_message_queue | default('INFO') }}\"", "LOG_LEVEL_DOCUMENT_INDEX: \"{{ connect_loglevel_document_index | default('INFO') }}\"",