Various fixes.
This commit is contained in:
parent
21d2962a9c
commit
407663fc96
|
@ -1,43 +0,0 @@
|
|||
---
|
||||
information_system_gui_docker_stack_name: 'information_system_gui_prod'
|
||||
information_system_gui_docker_service_server_name: 'information_system_gui'
|
||||
information_system_gui_docker_registry: 'hub.dev.d4science.org'
|
||||
information_system_gui_docker_server_image: '{{ information_system_gui_docker_registry }}/gcube/information-system-gui:stable'
|
||||
information_system_gui_docker_network: 'information_system_gui_net'
|
||||
information_system_gui_behind_haproxy: True
|
||||
information_system_gui_haproxy_public_net: 'haproxy-public'
|
||||
|
||||
# Environment
|
||||
information_system_gui_server_hostname: 'informationsystemgui.d4science.org'
|
||||
information_system_gui_spring_profile_active: 'prod,swagger'
|
||||
|
||||
# Metrics
|
||||
information_system_gui_management_metrics_export_prometheus_enabled: 'true'
|
||||
|
||||
# Jhipster
|
||||
information_system_gui_jhipster_sleep: '5'
|
||||
|
||||
# Logging
|
||||
information_system_gui_logging_level: 'DEBUG'
|
||||
|
||||
# Oauth2
|
||||
information_system_gui_spring_security_oauth2_client_provider_oidc_issuer_uri: 'https://accounts.dev.d4science.org/auth/realms/d4science'
|
||||
information_system_gui_spring_security_oauth2_client_provider_oidc_authorization_uri: '{{information_system_gui_spring_security_oauth2_client_provider_oidc_issuer_uri}}/protocol/openid-connect/auth'
|
||||
information_system_gui_spring_security_oauth2_client_provider_oidc_token_uri: '{{information_system_gui_spring_security_oauth2_client_provider_oidc_issuer_uri}}/protocol/openid-connect/token'
|
||||
information_system_gui_spring_security_oauth2_client_provider_oidc_user_info_uri: '{{information_system_gui_spring_security_oauth2_client_provider_oidc_issuer_uri}}/protocol/openid-connect/userinfo'
|
||||
information_system_gui_spring_security_oauth2_client_provider_oidc_jwk_set_uri: '{{information_system_gui_spring_security_oauth2_client_provider_oidc_issuer_uri}}/protocol/openid-connect/certs'
|
||||
|
||||
information_system_gui_spring_security_oauth2_client_registration_oidc_client_id: {{information_system_gui_spring_security_oauth2_client_registration_oidc_client_id_vault}}
|
||||
information_system_gui_spring_security_oauth2_client_registration_oidc_client_secret: {{information_system_gui_spring_security_oauth2_client_registration_oidc_client_secret_vault}}
|
||||
information_system_gui_spring_security_oauth2_client_registration_oidc_scope: 'openid, profile, email, phone, offline_access'
|
||||
|
||||
# Mail
|
||||
#information_system_gui_spring_mail_host: 'localhost'
|
||||
#information_system_gui_spring_mail_port: '25'
|
||||
#information_system_gui_spring_mail_username: ''
|
||||
#information_system_gui_spring_mail_password: ''
|
||||
|
||||
# Logging
|
||||
information_system_gui_logging_level: 'DEBUG'
|
||||
|
||||
# Application
|
|
@ -1,18 +0,0 @@
|
|||
$ANSIBLE_VAULT;1.1;AES256
|
||||
36643632343832613636643634306162613334343537613239353837643330343866353462323338
|
||||
3966396139383331353530373865656131313764376133640a616531343362663661643662393961
|
||||
61633062623632386536366666313037636431663538323836613961363461666134643231303466
|
||||
3535633261326236610a353532653533336134333134336336326138376663383134303234343761
|
||||
32636238346337393363356364343737346362366435353766616130396338643461353264306561
|
||||
66623966666464313436366262666139323163646433303534343333333461656466346263313230
|
||||
63393266656663353930376364323732653363346538616234313936613935633730656163336161
|
||||
66343664373633336166343033336633643161613066346531373961356338343935393064316338
|
||||
36626332623639353433306561656663663436353032643235376363376533653861636364376264
|
||||
66663364623135303331653834346662386435633635646433373862366338393336303434353062
|
||||
62616530376334343036303966363866646436386432613062333562626662653631303565373264
|
||||
34396161336634653336393038616635366635356166646234356163323364396465613639633437
|
||||
38363633653838373763383934333463333734303135316134323061643733623536303061653761
|
||||
63613166633763623865343230353066323366633336323362626630393832396337306661373035
|
||||
64633136383338636662653531356262663736316265303435346637666435396465356231613836
|
||||
62613838643834376566656135366136303362333765613862326634303731353862353638626466
|
||||
3838
|
|
@ -1,4 +0,0 @@
|
|||
[hosts_manager]
|
||||
docker-swarm1.int.d4science.net docker_swarm_manager_node=True
|
||||
docker-exec2.int.d4science.net
|
||||
|
|
@ -2,4 +2,4 @@
|
|||
- src: git+https://code-repo.d4science.org/InfraScience/ansible-role-information-system-gui.git
|
||||
version: master
|
||||
name: information-system-gui
|
||||
state: latest
|
||||
state: latest
|
||||
|
|
4
run.sh
4
run.sh
|
@ -74,8 +74,8 @@ fi
|
|||
if [ -n "$VAULT_GROUP_FILES" ] || [ -n "$VAULT_HOST_FILES" ] ; then
|
||||
# Vault requires a password.
|
||||
# To encrypt a password for a user: python -c "from passlib.hash import sha512_crypt; print sha512_crypt.encrypt('<password>')"
|
||||
if [ -f ~/.epas_ansible_vault_pass.txt ] ; then
|
||||
PLAY_OPTS="$PLAY_OPTS --vault-password-file=~/.epas_ansible_vault_pass.txt"
|
||||
if [ -f ~/.information_system_gui_ansible_vault_pass.txt ] ; then
|
||||
PLAY_OPTS="$PLAY_OPTS --vault-password-file=~/.information_system_gui_ansible_vault_pass.txt"
|
||||
else
|
||||
echo "There are password protected encrypted files, we will ask for password before proceeding"
|
||||
PLAY_OPTS="$PLAY_OPTS --ask-vault-pass"
|
||||
|
|
Loading…
Reference in New Issue