From 6f47f60565915d99e0152724cd0def5c44c426e7 Mon Sep 17 00:00:00 2001 From: Markus Date: Mon, 1 Jul 2024 09:42:24 +0300 Subject: [PATCH 1/3] add missing reference to gh ci private key file in jump context --- infrastructure/server-setup/inventory/production.yml | 3 ++- infrastructure/server-setup/inventory/staging.yml | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/infrastructure/server-setup/inventory/production.yml b/infrastructure/server-setup/inventory/production.yml index 924597414..40ac49c8f 100644 --- a/infrastructure/server-setup/inventory/production.yml +++ b/infrastructure/server-setup/inventory/production.yml @@ -64,5 +64,6 @@ backups: # If you are using a jump server to access this environment # jump: # hosts: -# your-jumpserver-hostname-here: # @todo set this to be the hostname of your backup server +# your-jumpserver-hostname-here: # @todo set this to be the hostname of your jump server +# ansible_ssh_private_key_file: /tmp/jump_ssh_private_key # Written by provision pipeline. Assumes "jump" environment exists in Github environments # ansible_host: '55.55.55.55' diff --git a/infrastructure/server-setup/inventory/staging.yml b/infrastructure/server-setup/inventory/staging.yml index 8f484aef0..4106d3b03 100644 --- a/infrastructure/server-setup/inventory/staging.yml +++ b/infrastructure/server-setup/inventory/staging.yml @@ -62,4 +62,5 @@ backups: # jump: # hosts: # your-jumpserver-hostname-here: # @todo set this to be the hostname of your backup server +# ansible_ssh_private_key_file: /tmp/jump_ssh_private_key # Written by provision pipeline. Assumes "jump" environment exists in Github environments # ansible_host: '55.55.55.55' From fa73ddd2f84d144ad36b9d9497bc25791019209e Mon Sep 17 00:00:00 2001 From: Markus Date: Mon, 1 Jul 2024 10:08:48 +0300 Subject: [PATCH 2/3] add todo comment for easier search experience --- infrastructure/server-setup/inventory/production.yml | 2 +- infrastructure/server-setup/inventory/staging.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/infrastructure/server-setup/inventory/production.yml b/infrastructure/server-setup/inventory/production.yml index 40ac49c8f..4176ff701 100644 --- a/infrastructure/server-setup/inventory/production.yml +++ b/infrastructure/server-setup/inventory/production.yml @@ -42,7 +42,7 @@ docker-manager-first: ansible_host: '22.22.22.22' # @todo set this to be the hostname of your target server data_label: data1 # If you are using a jump server to access this environment, enter other SSH args here. - # ansible_ssh_common_args: '-J jump@55.55.55.55 -o StrictHostKeyChecking=no' + # ansible_ssh_common_args: '-J jump@55.55.55.55 -o StrictHostKeyChecking=no' # @todo set this to be the IP address of your jump server # @todo We recommend you add 2-4 workers for a scaled production deployment # This should depend on the size of your country and the number of end users. diff --git a/infrastructure/server-setup/inventory/staging.yml b/infrastructure/server-setup/inventory/staging.yml index 4106d3b03..50a6cb216 100644 --- a/infrastructure/server-setup/inventory/staging.yml +++ b/infrastructure/server-setup/inventory/staging.yml @@ -44,7 +44,7 @@ docker-manager-first: ansible_host: '11.11.11.11' # @todo set this to be the hostname of your target server data_label: data1 # If you are using a jump server to access this environment, enter other SSH args here. - # ansible_ssh_common_args: '-J jump@55.55.55.55 -o StrictHostKeyChecking=no' + # ansible_ssh_common_args: '-J jump@55.55.55.55 -o StrictHostKeyChecking=no' # @todo set this to be the IP address of your jump server # This staging servers is configured to only use one server docker-workers: {} From 7ac5bddd7e542c766a0ed5b7a2a29c5c3fa5da0d Mon Sep 17 00:00:00 2001 From: Markus Date: Mon, 1 Jul 2024 10:09:08 +0300 Subject: [PATCH 3/3] unify language by replacing replica with server --- infrastructure/environments/setup-environment.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/infrastructure/environments/setup-environment.ts b/infrastructure/environments/setup-environment.ts index b7b2159cc..12f8a9bfe 100644 --- a/infrastructure/environments/setup-environment.ts +++ b/infrastructure/environments/setup-environment.ts @@ -330,7 +330,7 @@ const sshQuestions = [ name: 'sshHost', type: 'text' as const, message: - 'What is the target server IP address? Note: For "production" environment server clusters of (2, 3 or 5 replicas) this is always the IP address for just 1 manager server', + 'What is the target server IP address? (Note: For "production" environment with 2, 3 or 5 servers, this is the IP address of the manager server', valueType: 'VARIABLE' as const, validate: notEmpty, valueLabel: 'SSH_HOST', @@ -401,7 +401,7 @@ const infrastructureQuestions = [ name: 'replicas', type: 'number' as const, message: - 'What is the number of replicas? EDIT: This should be 1 for qa, staging and backup environments. For "production" environment server clusters of (2, 3 or 5 replicas), set to 2, 3 or 5 as appropriate.', + 'What is the number of servers? Note: This should be 1 for qa, staging and backup environments. For "production" environment server cluster should consists of 2, 3 or 5 servers.', valueType: 'VARIABLE' as const, validate: notEmpty, valueLabel: 'REPLICAS',