diff --git a/group_vars/all/plain.yml b/group_vars/all/plain.yml index efa9cfc..b534604 100644 --- a/group_vars/all/plain.yml +++ b/group_vars/all/plain.yml @@ -53,14 +53,13 @@ smardigo_plattform_users: - 'daniel.dz' - 'peter.heise' - 'sven.ketelsen' - - 'vanphuong.ma' docker_owner: "{{ admin_user }}" docker_group: "{{ admin_user }}" service_base_path: '/etc/smardigo' # TODO we need a company email address -lets_encrypt_email: "sven.ketelsen@arxes-tolina.de" +lets_encrypt_email: "sven.ketelsen@netgo.de" # TODO place caddy configfile system relativ instead of docker folder relative caddy_base_path: '{{ service_base_path }}/caddy' @@ -107,7 +106,6 @@ hetzner_ssh_keys: - ansible@smardigo.digital - peter.heise@arxes-tolina.de - sven.ketelsen@arxes-tolina.de - - vanphuong.ma@arxes-tolina.de - daniel.dziedzicki@arxes-tolina.de #reverse_proxy_admin_username: "< see vault >" diff --git a/group_vars/stage_dev/plain.yml b/group_vars/stage_dev/plain.yml index ae522b5..e4c6d5b 100644 --- a/group_vars/stage_dev/plain.yml +++ b/group_vars/stage_dev/plain.yml @@ -147,4 +147,4 @@ kibana_extra_hosts: [ #] smardigo_management_url: "https://dev-management-smardigo-01.smardigo.digital/api/v1/scopes/{{ scope_id }}/processes/{{ process_instance_id }}/messages" -smardigo_management_token: "eyJlbmMiOiJBMTI4Q0JDLUhTMjU2IiwiYWxnIjoiZGlyIn0..JgixZcmsSyvovabQvREAjw.Fk7aNYwOjzMhLCqF_9unl5yrWTey26z4scZBeVZjhpE.fnovrqn0MUjM_TA8zVhXdQ" \ No newline at end of file +smardigo_management_token: "eyJlbmMiOiJBMTI4Q0JDLUhTMjU2IiwiYWxnIjoiZGlyIn0..JgixZcmsSyvovabQvREAjw.Fk7aNYwOjzMhLCqF_9unl5yrWTey26z4scZBeVZjhpE.fnovrqn0MUjM_TA8zVhXdQ" diff --git a/host_vars/dev-elastic-stack-01.yml b/host_vars/dev-elastic-stack-01.yml index 2d84211..20f1cd4 100644 --- a/host_vars/dev-elastic-stack-01.yml +++ b/host_vars/dev-elastic-stack-01.yml @@ -9,5 +9,4 @@ smardigo_plattform_users: - 'elastic' - 'peter.heise' - 'sven.ketelsen' - - 'vanphuong.ma' - 'daniel.dz' diff --git a/host_vars/dev-elastic-stack-02.yml b/host_vars/dev-elastic-stack-02.yml index 2d84211..20f1cd4 100644 --- a/host_vars/dev-elastic-stack-02.yml +++ b/host_vars/dev-elastic-stack-02.yml @@ -9,5 +9,4 @@ smardigo_plattform_users: - 'elastic' - 'peter.heise' - 'sven.ketelsen' - - 'vanphuong.ma' - 'daniel.dz' diff --git a/host_vars/dev-elastic-stack-03.yml b/host_vars/dev-elastic-stack-03.yml index 2d84211..20f1cd4 100644 --- a/host_vars/dev-elastic-stack-03.yml +++ b/host_vars/dev-elastic-stack-03.yml @@ -9,5 +9,4 @@ smardigo_plattform_users: - 'elastic' - 'peter.heise' - 'sven.ketelsen' - - 'vanphuong.ma' - 'daniel.dz' diff --git a/host_vars/dev-keycloak-01.yml b/host_vars/dev-keycloak-01.yml index 460324a..e0c765c 100644 --- a/host_vars/dev-keycloak-01.yml +++ b/host_vars/dev-keycloak-01.yml @@ -13,7 +13,7 @@ keycloak: { { "username": "docker-admin", "password": "docker-admin", - "email": "sven.ketelsen@arxes-tolina.de" + "email": "sven.ketelsen@netgo.de" } ], groups: [ diff --git a/host_vars/dev-mail-01.yml b/host_vars/dev-mail-01.yml index 4583306..1aeb652 100644 --- a/host_vars/dev-mail-01.yml +++ b/host_vars/dev-mail-01.yml @@ -6,7 +6,7 @@ postfix_mynetworks: - '127.0.0.0/8' # default - '[::ffff:127.0.0.0]/104' # default - '[::1]/128' # default - - '10.2.0.0/24' # private cloud subnet + - '10.0.0.0/24' # private cloud subnet postfix_hostname: 'dev-mail-01.smardigo.digital' postfix_mailname: 'dev-mail-01.smardigo.digital' postfix_smtpd_banner: '$myhostname ESMTP $mail_name' diff --git a/roles/connect/defaults/main.yml b/roles/connect/defaults/main.yml index f54ddb7..d9fb022 100644 --- a/roles/connect/defaults/main.yml +++ b/roles/connect/defaults/main.yml @@ -8,5 +8,6 @@ connect_version: 'latest' connect_admin_username: "connect-admin" connect_admin_password: "connect-admin" -connect_mail_properties_base_url: "{{ http_s }}://{{ connect_id }}.{{ domain }}" -connect_mail_properties_base_url_extern: "{{ http_s }}://{{ connect_id }}.{{ domain }}" +connect_mail_host: "{{ shared_service_mail_hostname }}" +connect_mail_properties_base_url: "{{ http_s }}://{{ stage_server_url_host }}" +connect_mail_properties_base_url_extern: "{{ http_s }}://{{ stage_server_url_host }}" diff --git a/roles/connect/vars/main.yml b/roles/connect/vars/main.yml index 7b943a4..49c8e20 100644 --- a/roles/connect/vars/main.yml +++ b/roles/connect/vars/main.yml @@ -47,7 +47,7 @@ connect_environment: [ "MAIL_PROPERTIES_SIMULATION: \"{{ connect_mail_properties_simulation | default('true') }}\"", "MAIL_PROPERTIES_BASE_URL: \"{{ connect_mail_properties_base_url }}\"", "MAIL_PROPERTIES_BASE_URL_EXTERN: \"{{ connect_mail_properties_base_url_extern }}\"", - "MAIL_PROPERTIES_SENDER: \"{{ connect_mail_properties_sender | default('noreply-connect@arxes-tolina.de') }}\"", + "MAIL_PROPERTIES_SENDER: \"{{ connect_mail_properties_sender | default('noreply-connect@netgo.de') }}\"", "MAIL_PROPERTIES_SENDER_ALIAS: \"{{ connect_mail_properties_sender_alias | default('noreply-connect') }}\"", "AUTH_MODULE: \"{{ connect_auth_module | default('preauth') }}\"", diff --git a/roles/prometheus/tasks/main.yml b/roles/prometheus/tasks/main.yml index 2cdfac0..6291707 100644 --- a/roles/prometheus/tasks/main.yml +++ b/roles/prometheus/tasks/main.yml @@ -188,13 +188,13 @@ loop: - { name: "{{ grafana_user_smardigo_login }}", - email: "smardigo@arxes-tolina.de", + email: "smardigo@netgo.de", login: "{{ grafana_user_smardigo_login }}", password: "{{ grafana_user_smardigo_password }}" } - { name: "{{ grafana_user_guest_login }}", - email: "grafana-guest@arxes-tolina.de", + email: "grafana-guest@netgo.de", login: "{{ grafana_user_guest_login }}", password: "{{ grafana_user_guest_password }}" } diff --git a/users/daniel.dz/id_rsa.pub b/users/daniel.dz/id_rsa.pub index 027ba11..aecf71d 100644 --- a/users/daniel.dz/id_rsa.pub +++ b/users/daniel.dz/id_rsa.pub @@ -1 +1 @@ -ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPIlzZlKDc/koTYUplB8G+fMKd7Nsh+WvkHfeTN9R16C daniel.dziedzicki@arxes-tolina.de +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPIlzZlKDc/koTYUplB8G+fMKd7Nsh+WvkHfeTN9R16C daniel.dziedzicki@netgo.de diff --git a/users/sven.ketelsen/id_rsa.pub b/users/sven.ketelsen/id_rsa.pub index d0ebe21..5c0dcb7 100644 --- a/users/sven.ketelsen/id_rsa.pub +++ b/users/sven.ketelsen/id_rsa.pub @@ -1 +1 @@ -ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDDiP5IHm3hTbO/DBEwVoEFvbiOX56d67Q4fPWkmJlLAygQ40kRJj2ijzYNCryh4JSxXxOVu42c79Lzyxt1h/OhayGOatdAyEe/GIQB0YI4G5UmIxZecZCxOT3Uqj4j0+LDHH8QFkJUI59FpznM9VezwciL2Dxc2dA8lrEtKJVoZuCxHSx84GwzqBZdIhyNSSGvXu/ZP/KpT8ACAx5F5PJ3D+B+3pYuYLnzsYJ8Y4RYCoQ8bIX89txJ7bF2lrMmPeE3t2ms4bAh+QbohED0SksQKt1xEt9gt/Be+cRdrdts5XYfdKyd4iAFtzuRVOUTt4OcwqrFsiDeJRLK8taMH9Fz sven.ketelsen@arxes-tolina.de \ No newline at end of file +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDDiP5IHm3hTbO/DBEwVoEFvbiOX56d67Q4fPWkmJlLAygQ40kRJj2ijzYNCryh4JSxXxOVu42c79Lzyxt1h/OhayGOatdAyEe/GIQB0YI4G5UmIxZecZCxOT3Uqj4j0+LDHH8QFkJUI59FpznM9VezwciL2Dxc2dA8lrEtKJVoZuCxHSx84GwzqBZdIhyNSSGvXu/ZP/KpT8ACAx5F5PJ3D+B+3pYuYLnzsYJ8Y4RYCoQ8bIX89txJ7bF2lrMmPeE3t2ms4bAh+QbohED0SksQKt1xEt9gt/Be+cRdrdts5XYfdKyd4iAFtzuRVOUTt4OcwqrFsiDeJRLK8taMH9Fz sven.ketelsen@netgo.de \ No newline at end of file diff --git a/users/vanphuong.ma/id_rsa.pub b/users/vanphuong.ma/id_rsa.pub deleted file mode 100644 index 5dd2e7c..0000000 --- a/users/vanphuong.ma/id_rsa.pub +++ /dev/null @@ -1 +0,0 @@ -ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDHgUkCCGkqAYt+WsTs0jnjVsZfIJdQoStX6hvV3l4K7UBJyGBmg7NxAZk053GYs2R6Ryg3S/Hqe4JeGX1XSxJTtpzPusBmvrEl4ei94h6F6IxeAyTjMrks3uS/n7awz4j6VcDW2OoHMbFl6VP8KPiWCjChG4Kz9peg9FhwFi9THlgr4cgSMjPjOfSoL43xWVOx+NC/JyFCBXD//WzsB02ceC71GG4W3RW8gAgNW9JOgdihP+qkA6oh68MBEPWr5uUolfoyQLSTGpE//YDCqgXyKCG1+bJ4UOZ3UC0nYayY/hWUIkPxHbZ5zCTYZ2Z2ah5u/QxGOryHFENbAu46MeKzPtoY3bfqfnfmB6C/rWTqUKIPBaKgaI104Lo1C+nmwhOiSewEKFZgoAzCoRWP+HoCDSceJyW9VlgoFR30nfFOaTnJ9N3um0YRZ+B5jDJOXE2+MoKBybfm/Johh/RKVWJvlrgUl7YuTTK0hd03FdRYEytReY/eQyNyXjqo9qmKwBk= vanphuong.ma@4K6N2X2 \ No newline at end of file