Amends to countryconfig files for configurability

.github/workflows/deploy-prod.yml

@@ -30,8 +30,8 @@ jobs:
           secret: ${{ github.TOKEN }}
           approvers: euanmillar,rikukissa
           minimum-approvals: 1
-          issue-title: 'Deploy (Prod): core: ${{ github.event.inputs.core-image-tag }} country config: ${{ github.event.inputs.countryconfig-image-tag }}'
-          issue-body: 'Please approve or deny the deployment of core: ${{ github.event.inputs.core-image-tag }} country config: ${{ github.event.inputs.countryconfig-image-tag }} to production'
+          issue-title: 'Deploy (${{ github.event.inputs.environment }}): core: ${{ github.event.inputs.core-image-tag }} country config: ${{ github.event.inputs.countryconfig-image-tag }}'
+          issue-body: 'Please approve or deny the deployment of core: ${{ github.event.inputs.core-image-tag }} country config: ${{ github.event.inputs.countryconfig-image-tag }} to ${{ github.event.inputs.environment }}'
           exclude-workflow-initiator-as-approver: false
       - name: Clone core
         uses: actions/checkout@v3

infrastructure/docker-compose.production-deploy.yml

@@ -39,7 +39,6 @@ services:
 
   metrics:
     environment:
-      - QA_ENV=true
       - NODE_ENV=production
       - SENTRY_DSN=${SENTRY_DSN}
       - MONGO_URL=mongodb://metrics:${METRICS_MONGODB_PASSWORD}@mongo1,mongo2/metrics?replicaSet=rs0
@@ -48,15 +47,13 @@ services:
 
   auth:
     environment:
-      - QA_ENV=true
       - NODE_ENV=production
       - SENTRY_DSN=${SENTRY_DSN}
     deploy:
       replicas: 2
 
   user-mgnt:
     environment:
-      - QA_ENV=true
       - NODE_ENV=production
       - SENTRY_DSN=${SENTRY_DSN}
       - MONGO_URL=mongodb://user-mgnt:${USER_MGNT_MONGODB_PASSWORD}@mongo1,mongo2/user-mgnt?replicaSet=rs0

infrastructure/docker-compose.staging-deploy.yml

@@ -39,7 +39,6 @@ services:
 
   metrics:
     environment:
-      - QA_ENV=true
       - NODE_ENV=production
       - SENTRY_DSN=${SENTRY_DSN}
       - MONGO_URL=mongodb://metrics:${METRICS_MONGODB_PASSWORD}@mongo1/metrics?replicaSet=rs0
@@ -48,15 +47,13 @@ services:
 
   auth:
     environment:
-      - QA_ENV=true
       - NODE_ENV=production
       - SENTRY_DSN=${SENTRY_DSN}
     deploy:
       replicas: 1
 
   user-mgnt:
     environment:
-      - QA_ENV=true
       - NODE_ENV=production
       - SENTRY_DSN=${SENTRY_DSN}
       - MONGO_URL=mongodb://user-mgnt:${USER_MGNT_MONGODB_PASSWORD}@mongo1/user-mgnt?replicaSet=rs0

infrastructure/server-setup/backups.yml

@@ -92,22 +92,6 @@
       tags:
         - backups
 
-    - name: Check if authorized_keys already exists
-      stat:
-        path: '{{ external_backup_server_user_home }}/.ssh/authorized_keys'
-      register: file_check
-      tags:
-        - backups
-
-    - name: Ensure .ssh directory exists for external backup server user
-      file:
-        path: '{{ external_backup_server_user_home }}/.ssh'
-        state: directory
-        owner: '{{ external_backup_server_user }}'
-        mode: '0700'
-      tags:
-        - backups
-
     - name: Ensure backup application servers can login to backup server
       blockinfile:
         path: '{{ external_backup_server_user_home }}/.ssh/authorized_keys'

infrastructure/server-setup/development.yml

@@ -18,8 +18,8 @@ all:
         sudoer: true
 
 docker-manager-first:
-  dev:
-    qa: # @todo set this to be the hostname of your target server
+  hosts:
+    dev: # @todo set this to be the hostname of your target server
       ansible_host: '44.44.44.44' # @todo set this to be the IP address of your server
       data_label: data1 # for manager machines, this should always be "data1"
 

infrastructure/server-setup/production.yml

@@ -50,5 +50,5 @@ docker-workers:
 
 backups:
   hosts:
-    qa:
+    backup: # @todo set this to be the hostname of your backup server
       ansible_host: '66.66.66.66'

infrastructure/server-setup/qa.yml

@@ -28,15 +28,6 @@ all:
           - ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABg...Z/rhU= provision@github-runner-243 # example provision user key
           - ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABg...Z/rhU= provision@github-runner-244 # example provision user key
 
-    # If the machine is repurposed to also be the backup host, we need to add more keys to the authorized_keys file so that
-    # when the application servers get provisioned, the provision user of this machine can be used.
-    #
-    # @todo remove this key if the machine is not used as a backup host.
-    # Otherwise, add the public key of the private key that's used for the "provision" user on the server of which backups this machine hosts.
-    additional_keys_for_provisioning_user:
-      - ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABg...Z/rhU= provision@github-runner-243 # example provision user key
-      - ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABg...Z/rhU= provision@github-runner-244 # example provision user key
-
 docker-manager-first:
   hosts:
     qa: # @todo set this to be the hostname of your target server

infrastructure/server-setup/staging.yml

@@ -46,5 +46,5 @@ docker-workers: {}
 # @todo if you do not intend to set up automatic sync from the backup server, you can remove this section.
 backups:
   hosts:
-    qa:
+    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

src/data-seeding/employees/handler.ts

@@ -8,12 +8,15 @@
  *
  * Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS.
  */
+import { QA_ENV } from '@countryconfig/constants'
 import { readCSVToJSON } from '@countryconfig/utils'
 import { Request, ResponseToolkit } from '@hapi/hapi'
 
 export async function usersHandler(_: Request, h: ResponseToolkit) {
   const users: unknown[] = await readCSVToJSON(
-    './src/data-seeding/employees/source/default-employees.csv'
+    process.env.NODE_ENV === 'production' && !QA_ENV
+      ? './src/data-seeding/employees/source/prod-employees.csv'
+      : './src/data-seeding/employees/source/test-employees.csv'
   )
   return h.response(users)
 }

src/data-seeding/employees/source/prod-employees.csv

@@ -0,0 +1 @@
+primaryOfficeId,givenNames,familyName,systemRole,role,mobile,username,email,password