diff --git a/group_vars/stage_ext/vault.yml b/group_vars/stage_ext/vault.yml index 7489e07..022b394 100644 --- a/group_vars/stage_ext/vault.yml +++ b/group_vars/stage_ext/vault.yml @@ -1,38 +1,24 @@ $ANSIBLE_VAULT;1.1;AES256 -33333066376262633237653637383134356335306635366566643965653262646262323932323466 -6561333261383931663562626166333362353932623534350a373062623534626365343035383837 -36663935633235646665373231353664666130323565633136383463333164326634366338353032 -6335343236613638660a376231336538303665343563343234323737623139666665316131333563 -66393733336333396364353833363431346633636231393936376163623961336361313231323962 -64646636363366663633633837636131663965373336323230303866373138306533393162323031 -36313765343365376661663539313739363334623561336135333565336461363132653766626239 -63666536663935643838373530653633663635313631343036373438643134313733323339386638 -63343633616438646266396434633232343831663936313966666434366462333533656362306665 -62333533633139646135336563623332643635663932623762656366383464376130643732323233 -63376433366564336533346234376662353436333736663061356662346561303838383064646538 -62326564373737633139646162663131363066376365396665396361623339666632313061353862 -30653865613263616362363532666136363738386662396537643834313862393332643966326661 -66346234323534363762663335356633363262323039613136326535363133343262613863663731 -66643565366464366433666462316332643638366536663536386434616232656265343364346537 -37636161343763343335343635656565333431376264346161313934303564656335393630353264 -36616363396231633236393663633032333537633531316539633634323834663161313137313661 -39616634303238653765643233646634323930613937663262653732326532303439343462383939 -36356163346565666331613636633836623534336465643137306238336362303637633163393666 -33353230373230393163373839633661353932336464343162643638333733393066616632386639 -38356336653135326437666536346166613064353839356166383763646236363236633566393730 -39623861373434663661623731396138333162316362323239633838336532633933363537663439 -62326265376463393862613666613132666130316537626136303137356339613063313631333130 -39343832613138333539646436363934333061386361313665643230393531383663353465376466 -66623439653036643339343666373232376231626638646339316230643439343630653634343430 -31616235393365376636326561393930326333633733303265633362633338636266343162666435 -36393337646332343264646334313162326563306234663533396465626539616663333366346232 -65626136646534306535663830613733306235643031633538303132303234373431643461373734 -35346438303930353838383737356563613034373764376465643235653562386165643261366466 -66373730333162363230666661323233336633343637653964333237306564396433303131646538 -31613865386234396165303231653862663936396436393134353339613265613734356439353937 -32616463363236613138633831326337643338613164383030646437333832316262616134616262 -31363533326632336235643432393562393562626466303162336162373835313232363933383763 -66633065336664636535393735343034613237363335393563353630363866356238383936653232 -66373939653039636436353932623439646239356661646634613865363833356365636334313437 -66326634333030613030343833346237353061313238383566343561633166613763396639616535 -38316133366539383461643035623337353866393364656135633438383534626363 +30316130326434323533613836303239636361376431353133363233333566313135346232663534 +6335633261323064386630363336316635636537333238650a323738333831383963363031313338 +34643139323365643561313637623463653238316138656437346632656532356330323335366464 +6436363531346137390a343633373630626439376163623331613139386363303461323136636336 +30343636646366303737663364363364636266643731666634643134306430356338653239663037 +64633135393937663834626134383736643139393634386465303437366563346261316534306139 +39636431313532613464623137336334333836376465623035353166363631383733313163353838 +32666539323465666238616331346561363938616130343934613935306533393930626532303832 +65323762343936353834343039363332656661613139363831613366346262623732623439613366 +65633435313336316433363339303739303531316364366164306230393230333038616465306163 +31336231643238343964393535333936613238323339356539346464363639623665643663306363 +63373334303235626139663331613432623539313531313937336437613763643161376462623366 +35653166373934663935323933343733363264366630656162353164313938356431323730393130 +63616361323264333561373062306662613033653661306364313832373336333534326136656631 +30303364623636386432343165646535646663353436633463376534346336623632396434306134 +61373432346434663764643435386639613562656632383962326139303233613335663637376438 +63633833393363323237616631623236653539313532663133633737373831666435363066656631 +30323766663535393735323264623330336662663039373934636531643537373333366138373864 +38623139306534303730353037373032623533313939366561653261366565313466663637653335 +33633836353966363864663961363962353061666334633165356166333731633966366239653333 +62303438613235383638383637303263623834666336393636393237313031383666336262666334 +63346439633032653338336533396532326634646236346536303862383531303430636136343235 +316337613734663564373334333963633361 diff --git a/host_vars/ext-bdev-mpmexec-02.yml b/host_vars/ext-bdev-mpmexec-02/plain.yml similarity index 85% rename from host_vars/ext-bdev-mpmexec-02.yml rename to host_vars/ext-bdev-mpmexec-02/plain.yml index 6b61cfe..61db022 100644 --- a/host_vars/ext-bdev-mpmexec-02.yml +++ b/host_vars/ext-bdev-mpmexec-02/plain.yml @@ -8,3 +8,5 @@ connect_external_domain: "ext-bdev-mpmexec-connect" keycloak_external_domain: "ext-bdev-mpmexec-keycloak" traefik_dns_01_challenge: false + +sma_jwt_secret: "{{ sma_jwt_secret_vault }}" diff --git a/host_vars/ext-bdev-mpmexec-02/vault.yml b/host_vars/ext-bdev-mpmexec-02/vault.yml new file mode 100644 index 0000000..a97de2a --- /dev/null +++ b/host_vars/ext-bdev-mpmexec-02/vault.yml @@ -0,0 +1,22 @@ +$ANSIBLE_VAULT;1.1;AES256 +62396561376535633331366135626166313361653939363663623337353163353932303265656338 +6133636136653233363037323831636662653238356132610a356535373932336439376132353139 +39343134613366623462313361326230316338613235306539306330313861393137386137353035 +3430643161656532310a363565656236306238306661663864396265343162333136313130333764 +32643366626630323466386330656232316261373130363035306633616566333638633234636634 +31373866616363306663313165346532646464313065326637656630363335663663663164626366 +31623133343637346338633162366136363661333339623761313132336437393836663564636137 +39346133643439376230346439356232616363613839346664353761306535386331333766313334 +37613030376339653130386264383831643539323866333666663338336366343266666231653761 +36316633356537363662656138626135343636666635613264663339393632643362343463643537 +62383931356630303863323039326664353235613635353164383530333066316430353638663263 +36353733393337626565373435306134353764363230656662653538626133303332633034323633 +38653238646562636265393862666432306235663862356238393539376563626438313335613933 +64343636623938356433306265346233643161623131356238386162353466333330343930376265 +36323537633566363364623164343938396165396265633763313434386438356533656430313931 +62313836326130343261346435383137653431356335383633326162646566333964643132383065 +63343030663938646531346638303433623435323662616333613861626133356531356135343334 +65393663306364346432636133376335343432363664343263363439363434643266356634393132 +37396565343430306534363238313561643032383062303833353732303739373030336362363234 +65373366636662313330613163326265333933356139663439666634393937356133623235663265 +3436 diff --git a/templates/connect-compact/config/application-linked-applications.yml.j2 b/templates/connect-compact/config/application-linked-applications.yml.j2 new file mode 100644 index 0000000..f9d5faf --- /dev/null +++ b/templates/connect-compact/config/application-linked-applications.yml.j2 @@ -0,0 +1,11 @@ +smardigo: + linked-applications: + - + name: Password Change + url: https://{{ keycloak_external_domain }}.{{ domain }}/auth/realms/connect/account/password + - + name: User Management + url: https://{{ keycloak_external_domain }}.{{ domain }}/auth/admin/connect/console + - + name: MPM Process Mining + url: https://mehrwerk-demo.eu.qlikcloud.com \ No newline at end of file diff --git a/templates/connect-compact/docker-compose.yml.j2 b/templates/connect-compact/docker-compose.yml.j2 index aa3f3da..10d6b2f 100644 --- a/templates/connect-compact/docker-compose.yml.j2 +++ b/templates/connect-compact/docker-compose.yml.j2 @@ -18,7 +18,7 @@ services: labels: - "traefik.enable=true" - "traefik.http.routers.{{ connect_id }}.service={{ connect_id }}" - - "traefik.http.routers.{{ connect_id }}.rule=Host(`{{ connect_id }}.smardigo.digital`)" + - "traefik.http.routers.{{ connect_id }}.rule=Host(`{{ connect_id }}.{{ domain }}`)" - "traefik.http.routers.{{ connect_id }}.entrypoints=websecure" - "traefik.http.routers.{{ connect_id }}.tls=true" - "traefik.http.routers.{{ connect_id }}.tls.certresolver=letsencrypt-http" @@ -27,13 +27,15 @@ services: connect_external_domain is defined %} - "traefik.http.routers.{{ connect_id }}-extern.service={{ connect_id }}-extern" - - "traefik.http.routers.{{ connect_id }}-extern.rule=Host(`{{ connect_external_domain }}.smardigo.digital`)" + - "traefik.http.routers.{{ connect_id }}-extern.rule=Host(`{{ connect_external_domain }}.{{ domain }}`)" - "traefik.http.routers.{{ connect_id }}-extern.entrypoints=websecure" - "traefik.http.routers.{{ connect_id }}-extern.tls=true" - "traefik.http.routers.{{ connect_id }}-extern.tls.certresolver=letsencrypt-http" - "traefik.http.services.{{ connect_id }}-extern.loadbalancer.server.port=8080" {% endif %} environment: + NAME: "MPM eXecution 2.0" + TENANT_ID: "connect" ADMIN_LOGIN: "{{ connect_admin_username }}" ADMIN_PASSWORD: "{{ connect_admin_password }}" @@ -48,8 +50,8 @@ services: MAIL_USER: "smardigo.email@web.de" MAIL_PASSWORD: "MUqzILYtspSYGmw0k34F" MAIL_PROPERTIES_SIMULATION: "false" - MAIL_PROPERTIES_BASE_URL: "https://{{ connect_id }}.smardigo.digital" - MAIL_PROPERTIES_BASE_URL_EXTERN: "https://{{ connect_id }}.smardigo.digital" + MAIL_PROPERTIES_BASE_URL: "https://{{ connect_id }}.{{ domain }}" + MAIL_PROPERTIES_BASE_URL_EXTERN: "https://{{ connect_id }}.{{ domain }}" MAIL_PROPERTIES_SENDER: "smardigo.email@web.de" MAIL_PROPERTIES_SENDER_ALIAS: "noreply-connect" MAIL_PROPERTIES_SMTP_AUTH: "true" @@ -60,9 +62,9 @@ services: OIDC_CLIENT_ID: "connect" OIDC_CLIENT_SECRET: "connect" OIDC_REGISTRATION_ID: "connect" - OIDC_ISSUER_URI: "https://{{ keycloak_external_domain }}.smardigo.digital/auth/realms/connect" - PASSWORD_CHANGE_URL: "" - USER_MANAGEMENT_URL: "" + OIDC_ISSUER_URI: "https://{{ keycloak_external_domain }}.{{ domain }}/auth/realms/connect" + PASSWORD_CHANGE_URL: "https://{{ keycloak_external_domain }}.{{ domain }}/auth/realms/connect/account/password" + USER_MANAGEMENT_URL: "https://{{ keycloak_external_domain }}.{{ domain }}/auth/admin/connect/console" IAM_MODULE: "embedded" IAM_CLIENT_ENABLED: "false" @@ -76,11 +78,17 @@ services: ELASTIC_MESSAGE_INDEX: "message" ELASTIC_ANALYSIS_INDEX: "analysis" - SPRINGDOC_SERVER_URL: "https://{{ connect_id }}.smardigo.digital" - SMA_CORS_ORIGINS: "https://{{ connect_id }}.smardigo.digital" + SPRING_PROFILES_INCLUDE: "linked-applications, swagger, elastic" + PROCESS_SEARCH_MODULE: "external" + + SPRINGDOC_SERVER_URL: "https://{{ connect_id }}.{{ domain }}" + SMA_CORS_ORIGINS: "https://{{ connect_id }}.{{ domain }}" SMA_CORS_ALLOWED_METHODS: "*" SMA_CORS_ALLOWED_HEADERS: "*" SMA_CORS_PATH_PATTERN: "/**" + SMA_LANGUAGE_CODE: "en" + SMA_JWT_ENABLED: "True" + SMA_JWT_SECRET: "{{ sma_jwt_secret }}" RESUBMISSION_ENABLED: "true" ELEMENT_TEMPLATE_ENABLED: "true" @@ -96,6 +104,8 @@ services: LOG_LEVEL_DOCUMENT_INDEX: "INFO" LOG_LEVEL_WORKFLOW_INDEX: "INFO" LOG_LEVEL_WORKFLOW_ANALYSIS: "INFO" + volumes: + - "./config/application-linked-applications.yml:/config/application-linked-applications.yml" networks: - "back-tier" - "front-tier"