Skip to content

Commit

Permalink
Merge pull request #178 from opencrvs/auto-pr-release-v1.5.0-176-13932
Browse files Browse the repository at this point in the history
🍒 Merge changes from PR #176 to release-v1.5.0
  • Loading branch information
makelicious authored Jul 3, 2024
2 parents 5fa4736 + 7ac5bdd commit c131130
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 5 deletions.
4 changes: 2 additions & 2 deletions infrastructure/environments/setup-environment.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down Expand Up @@ -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',
Expand Down
5 changes: 3 additions & 2 deletions infrastructure/server-setup/inventory/production.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 [email protected] -o StrictHostKeyChecking=no'
# ansible_ssh_common_args: '-J [email protected] -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.
Expand All @@ -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'
3 changes: 2 additions & 1 deletion infrastructure/server-setup/inventory/staging.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 [email protected] -o StrictHostKeyChecking=no'
# ansible_ssh_common_args: '-J [email protected] -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: {}
Expand All @@ -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'

0 comments on commit c131130

Please sign in to comment.