From dbcb27f9e15579ef65b4b7346ca1af87cc19b169 Mon Sep 17 00:00:00 2001 From: "Al hel md. shahriar zaman" Date: Wed, 20 Nov 2024 18:05:36 +0600 Subject: [PATCH] Revert "Merge pull request #324 from opencrvs/server-config" This reverts commit b7581efe9e195bc786fd73e54eec1b3eaf270397, reversing changes made to 1d3e670c3899b91e22df460b7eee713363258ac1. --- .../server-setup/inventory/backup.yml | 18 +++---------- .../server-setup/inventory/production.yml | 25 ++++++++----------- infrastructure/server-setup/inventory/qa.yml | 13 +++------- .../server-setup/inventory/staging.yml | 18 ++++++------- 4 files changed, 25 insertions(+), 49 deletions(-) diff --git a/infrastructure/server-setup/inventory/backup.yml b/infrastructure/server-setup/inventory/backup.yml index c3e91da7f7..41ab8e839a 100644 --- a/infrastructure/server-setup/inventory/backup.yml +++ b/infrastructure/server-setup/inventory/backup.yml @@ -21,23 +21,13 @@ all: users: # @todo this is where you define which development team members have access to the server. # If you need to remove access from someone, do not remove them from this list, but instead set their state: absent - - name: niko + - name: my-user ssh_keys: - - ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDGy93egakrVxXHb9LafRQ7T0Cl+p+gCTuymLyofTLK2ncwKhOZ/uV5SuzaKb4lJbBnpmxNdvAxsYXff5srvJfrV0ZZXFQdAAg0mmWuXxrhNfaE52S4s6WVKknTqDE5PhMxzVxzynBnaTdW9Cno7mO+rnS/VybjZIadpOuv5Bek1PztBmrUi4h0Qg1PxXNmFqzyc1dsil1T0nFeu5cH59G5fF1/oSUlC6CYBNoHdQ62IBoydBwMumk/trFoTlxPNK1wXgcUvsr8Sa5A4lN2Rrc6Y22CEGwomtyjHb2kDVbI+7B1Zq+S89yyyvkPFezEsCdK/Ehaj8HzfcsR/bassSn0/Xv3bL20eh7wv7cnut40kFizYifNGfpEqPvSzjfJbB4iG2WSKkW8F9t0/cvd0AdY/3jB0vXhvnRvCqHm1X6JVdGamF3GJeHUMk9JDg3rQdT47BZUtSJer4MGWWcNiALjeWPNLXK9cAvrI/6GbHbPyTzACfR6nhs03Z/eebuvpp0= - state: present - sudoer: true - - name: shoumik - ssh_keys: - - ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINRSRTqm3vOfjyTutISEtbVp7ZddoWa9NZDZLeWZGzLy dsi@dsi-Inspiron-15-3511 - state: present - sudoer: true - - name: riku - ssh_keys: - - ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDWIF63S4f3z9wQMvWibmvl7MPuJ6EVrkP0HuvgNhcs/4DZYMcR/GRBvV4ldOSYMlBevIXycgGzNDxKJgENUuwIWanjBu7uVAHyD6+cIRD1h63qq7Cjv/2HYTfBDKOrKzPOhA6zWvKO0ZGWsjRXk5LWMCbKOkvKJCxOpj/NVBxeE4FTK5YADYPV3OSsmBtqTHrVLm2sMmShU/2hMYYswWkobidjX65+nK/X+3C+yJbHwiydVvn+QCrFlFfCLPWKe8rUpOxyxofPqWVQh6CHhHfT8okaOc9sOE8Qeip9ljo84DftJh3Xm3ynOdWK1hH2BvRvxNadWqcE1qECbkg4tx2x riku.rouvila@gmail.com + - ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABg...Z/rhU= user@example.com state: present sudoer: true backups-host: hosts: - shoumikland-backup: # @todo set this to be the hostname of your backup server - ansible_host: '5.223.45.193' + backup: # @todo set this to be the hostname of your backup server + ansible_host: '66.66.66.66' diff --git a/infrastructure/server-setup/inventory/production.yml b/infrastructure/server-setup/inventory/production.yml index 7cb5c8f355..4176ff701d 100644 --- a/infrastructure/server-setup/inventory/production.yml +++ b/infrastructure/server-setup/inventory/production.yml @@ -30,21 +30,16 @@ all: users: # @todo this is where you define which development team members have access to the server. # If you need to remove access from someone, do not remove them from this list, but instead set their state: absent - - name: riku + - name: my-user ssh_keys: - - ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDWIF63S4f3z9wQMvWibmvl7MPuJ6EVrkP0HuvgNhcs/4DZYMcR/GRBvV4ldOSYMlBevIXycgGzNDxKJgENUuwIWanjBu7uVAHyD6+cIRD1h63qq7Cjv/2HYTfBDKOrKzPOhA6zWvKO0ZGWsjRXk5LWMCbKOkvKJCxOpj/NVBxeE4FTK5YADYPV3OSsmBtqTHrVLm2sMmShU/2hMYYswWkobidjX65+nK/X+3C+yJbHwiydVvn+QCrFlFfCLPWKe8rUpOxyxofPqWVQh6CHhHfT8okaOc9sOE8Qeip9ljo84DftJh3Xm3ynOdWK1hH2BvRvxNadWqcE1qECbkg4tx2x riku.rouvila@gmail.com - state: present - sudoer: true - - name: shoumik - ssh_keys: - - ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINRSRTqm3vOfjyTutISEtbVp7ZddoWa9NZDZLeWZGzLy dsi@dsi-Inspiron-15-3511 + - ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABg...Z/rhU= user@example.com state: present sudoer: true docker-manager-first: hosts: - shoumikland-prod: # @todo set this to be the hostname of your target server - ansible_host: '5.223.47.240' # @todo set this to be the hostname of your target server + prod-01: # @todo set this to be the hostname of your target server + 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' # @todo set this to be the IP address of your jump server @@ -52,17 +47,17 @@ docker-manager-first: # @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. # If you are only using one production worker for very small countries or small pilot projects, replace with an empty block like so: docker-workers: {} -# docker-workers: -# hosts: -# prod-02: # @todo set this to be the hostname of your target server -# ansible_host: '33.33.33.33' +docker-workers: + hosts: + prod-02: # @todo set this to be the hostname of your target server + ansible_host: '33.33.33.33' # 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' backups: hosts: - shoumikland-backup: # @todo set this to be the hostname of your backup server - ansible_host: '5.223.45.193' # set this to be the IP address of your backup server + backup: # @todo set this to be the hostname of your backup server + ansible_host: '66.66.66.66' # Written by provision pipeline. Assumes "backup" environment # exists in Github environments ansible_ssh_private_key_file: /tmp/backup_ssh_private_key diff --git a/infrastructure/server-setup/inventory/qa.yml b/infrastructure/server-setup/inventory/qa.yml index 1ccd47fe2c..d1247ebc0d 100644 --- a/infrastructure/server-setup/inventory/qa.yml +++ b/infrastructure/server-setup/inventory/qa.yml @@ -11,21 +11,16 @@ all: users: # @todo this is where you define which development team members have access to the server. # If you need to remove access from someone, do not remove them from this list, but instead set their state: absent - - name: riku + - name: my-user ssh_keys: - - ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDWIF63S4f3z9wQMvWibmvl7MPuJ6EVrkP0HuvgNhcs/4DZYMcR/GRBvV4ldOSYMlBevIXycgGzNDxKJgENUuwIWanjBu7uVAHyD6+cIRD1h63qq7Cjv/2HYTfBDKOrKzPOhA6zWvKO0ZGWsjRXk5LWMCbKOkvKJCxOpj/NVBxeE4FTK5YADYPV3OSsmBtqTHrVLm2sMmShU/2hMYYswWkobidjX65+nK/X+3C+yJbHwiydVvn+QCrFlFfCLPWKe8rUpOxyxofPqWVQh6CHhHfT8okaOc9sOE8Qeip9ljo84DftJh3Xm3ynOdWK1hH2BvRvxNadWqcE1qECbkg4tx2x riku.rouvila@gmail.com - state: present - sudoer: true - - name: shoumik - ssh_keys: - - ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINRSRTqm3vOfjyTutISEtbVp7ZddoWa9NZDZLeWZGzLy dsi@dsi-Inspiron-15-3511 + - ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABg...Z/rhU= user@example.com state: present sudoer: true docker-manager-first: hosts: - shoumikland-qa: # @todo set this to be the hostname of your target server - ansible_host: '5.223.51.253' # @todo set this to be the IP address of your server + qa: # @todo set this to be the hostname of your target server + ansible_host: '55.55.55.55' # @todo set this to be the IP address of your server # ansible_port: '23' # @todo set this to be the SSH port if it's not 22 # internal_ssh_port: '22' # @todo if you are port-forwarding and server SSH port is not the same as ansible_port, set it here data_label: data1 # for manager machines, this should always be "data1" diff --git a/infrastructure/server-setup/inventory/staging.yml b/infrastructure/server-setup/inventory/staging.yml index ecd002dffc..50a6cb216c 100644 --- a/infrastructure/server-setup/inventory/staging.yml +++ b/infrastructure/server-setup/inventory/staging.yml @@ -32,20 +32,16 @@ all: users: # @todo this is where you define which development team members have access to the server. # If you need to remove access from someone, do not remove them from this list, but instead set their state: absent - - name: riku + - name: my-user ssh_keys: - - ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDWIF63S4f3z9wQMvWibmvl7MPuJ6EVrkP0HuvgNhcs/4DZYMcR/GRBvV4ldOSYMlBevIXycgGzNDxKJgENUuwIWanjBu7uVAHyD6+cIRD1h63qq7Cjv/2HYTfBDKOrKzPOhA6zWvKO0ZGWsjRXk5LWMCbKOkvKJCxOpj/NVBxeE4FTK5YADYPV3OSsmBtqTHrVLm2sMmShU/2hMYYswWkobidjX65+nK/X+3C+yJbHwiydVvn+QCrFlFfCLPWKe8rUpOxyxofPqWVQh6CHhHfT8okaOc9sOE8Qeip9ljo84DftJh3Xm3ynOdWK1hH2BvRvxNadWqcE1qECbkg4tx2x riku.rouvila@gmail.com - state: present - sudoer: true - - name: shoumik - ssh_keys: - - ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINRSRTqm3vOfjyTutISEtbVp7ZddoWa9NZDZLeWZGzLy dsi@dsi-Inspiron-15-3511 + - ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABg...Z/rhU= user@example.com state: present sudoer: true + docker-manager-first: hosts: - shoumikland-staging: # @todo set this to be the hostname of your target server - ansible_host: '5.223.51.99' # @todo set this to be the hostname of your target server + staging: # @todo set this to be the hostname of your target server + 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' # @todo set this to be the IP address of your jump server @@ -57,8 +53,8 @@ docker-workers: {} # @todo if you do not intend to set up automatic sync from the backup server, you can remove this section. backups: hosts: - shoumikland-backup: # @todo set this to be the hostname of your backup server - ansible_host: '5.223.45.193' # set this to be the IP address of your backup server + backup: # @todo set this to be the hostname of your backup server + ansible_host: '66.66.66.66' # set this to be the IP address of your backup server # Written by provision pipeline. Assumes "backup" environment # exists in Github environments ansible_ssh_private_key_file: /tmp/backup_ssh_private_key