bugfix: cleanup

- shared service declaration for maria
- webdav usage out of connect
master
Sven Ketelsen 4 years ago
parent 8cb1e919b3
commit 3fe81a7ac4

@ -18,6 +18,7 @@ shared_service_maria_ip: "10.0.0.19"
shared_service_pg_master_ip: "10.0.0.17" shared_service_pg_master_ip: "10.0.0.17"
shared_service_pg_slave_ip: "10.0.0.18" shared_service_pg_slave_ip: "10.0.0.18"
shared_service_webdav_ip: "10.0.0.16" shared_service_webdav_ip: "10.0.0.16"
shared_service_maria_ip: "188.34.198.231"
shared_service_awx_hostname: "dev-awx-01.smardigo.digital" shared_service_awx_hostname: "dev-awx-01.smardigo.digital"
shared_service_docker_registry_hostname: "dev-docker-registry-01.smardigo.digital" shared_service_docker_registry_hostname: "dev-docker-registry-01.smardigo.digital"
@ -28,6 +29,7 @@ shared_service_maria_hostname: "dev-maria-01.smardigo.digital"
shared_service_pg_master_hostname: "dev-postgres-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_pg_slave_hostname: "dev-postgres-02.smardigo.digital"
shared_service_webdav_hostname: "dev-webdav-01.smardigo.digital" shared_service_webdav_hostname: "dev-webdav-01.smardigo.digital"
shared_service_maria_hostname: "dev-maria-01.smardigo.digital"
shared_service_hosts: [ shared_service_hosts: [
{ {
@ -142,15 +144,15 @@ connect_extra_hosts: [
ip: "{{ shared_service_pg_master_ip }}", ip: "{{ shared_service_pg_master_ip }}",
}, },
{ {
hostname: dev-elastic-stack-01-elastic, hostname: "dev-elastic-stack-01-elastic",
ip: "{{ shared_service_elastic_01 }}", ip: "{{ shared_service_elastic_01 }}",
}, },
{ {
hostname: dev-elastic-stack-02-elastic, hostname: "dev-elastic-stack-02-elastic",
ip: "{{ shared_service_elastic_02 }}", ip: "{{ shared_service_elastic_02 }}",
}, },
{ {
hostname: dev-elastic-stack-03-elastic, hostname: "dev-elastic-stack-03-elastic",
ip: "{{ shared_service_elastic_03 }}", ip: "{{ shared_service_elastic_03 }}",
}, },
{ {
@ -165,6 +167,10 @@ connect_extra_hosts: [
hostname: "{{ shared_service_mail_hostname }}", hostname: "{{ shared_service_mail_hostname }}",
ip: "{{ shared_service_mail_ip }}", ip: "{{ shared_service_mail_ip }}",
}, },
{
hostname: "{{ shared_service_webdav_hostname }}",
ip: "{{ shared_service_webdav_ip }}",
},
] ]
keycloak_extra_hosts: [ keycloak_extra_hosts: [
{ {

@ -81,7 +81,7 @@ connect_environment: [
"ELASTIC_ANALYSIS_INDEX: \"{{ connect_elastic_analysis_index | default('analysis') }}\"", "ELASTIC_ANALYSIS_INDEX: \"{{ connect_elastic_analysis_index | default('analysis') }}\"",
"SMA_ENABLE_WEBDAV_DOC_EDITING: \"true\"", "SMA_ENABLE_WEBDAV_DOC_EDITING: \"true\"",
"SMA_WEBDAV_BASE_PATH: \"https://{{ shared_service_webdav_hostname }}\"", "SMA_WEBDAV_BASE_PATH: \"https://{{ stage_server_url_host }}\"",
"SMA_WEBDAV_HOST_URL: \"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_FRONTEND_URL: \"https://{{ shared_service_webdav_hostname }}.smardigo.digital/\"",
"SMA_WEBDAV_JWT_SECRET: \"{{ webdav_jwt_secret }}\"", "SMA_WEBDAV_JWT_SECRET: \"{{ webdav_jwt_secret }}\"",

Loading…
Cancel
Save