Fix conflicts

opencrvs · Dec 14, 2023 · 7cead57 · 7cead57
2 parents b530937 + 1b563dc
commit 7cead57
Show file tree

Hide file tree

Showing 28 changed files with 765 additions and 212 deletions.
diff --git a/.github/workflows/deploy-prod.yml b/.github/workflows/deploy-prod.yml
@@ -57,11 +57,19 @@ jobs:
           cd opencrvs-core
           git checkout ${{ github.event.inputs.core-image-tag }}
 
+      - name: Read known hosts
+        run: |
+          cd ${{ github.event.repository.name }}
+          echo "KNOWN_HOSTS<<EOF" >> $GITHUB_ENV
+          sed -i -e '$a\' ./infrastructure/.known-hosts
+          cat ./infrastructure/.known-hosts >> $GITHUB_ENV
+          echo "EOF" >> $GITHUB_ENV
+
       - name: Install SSH Key
         uses: shimataro/ssh-key-action@v2
         with:
           key: ${{ secrets.SSH_KEY }}
-          known_hosts: ${{ secrets.KNOWN_HOSTS }}
+          known_hosts: ${{ env.KNOWN_HOSTS }}
 
       - name: Login to DockerHub
         uses: docker/login-action@v1

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -1,4 +1,4 @@
-name: Deploy(development)
+name: Deploy (development)
 run-name: Deploy to ${{ github.event.inputs.environment }} with reset=${{ github.event.inputs.reset }} core=${{ github.event.inputs.core-image-tag }} country config=${{ github.event.inputs.countryconfig-image-tag }}
 on:
   workflow_dispatch:
@@ -11,6 +11,7 @@ on:
         options:
           - staging
           - qa
+          - development
       core-image-tag:
         description: Core DockerHub image tag
         required: true
@@ -60,11 +61,19 @@ jobs:
           cd opencrvs-core
           git checkout ${{ github.event.inputs.core-image-tag }}
 
+      - name: Read known hosts
+        run: |
+          cd ${{ github.event.repository.name }}
+          echo "KNOWN_HOSTS<<EOF" >> $GITHUB_ENV
+          sed -i -e '$a\' ./infrastructure/.known-hosts
+          cat ./infrastructure/.known-hosts >> $GITHUB_ENV
+          echo "EOF" >> $GITHUB_ENV
+
       - name: Install SSH Key
         uses: shimataro/ssh-key-action@v2
         with:
           key: ${{ secrets.SSH_KEY }}
-          known_hosts: ${{ secrets.KNOWN_HOSTS }}
+          known_hosts: ${{ env.KNOWN_HOSTS }}
 
       - name: Login to DockerHub
         uses: docker/login-action@v1

diff --git a/.github/workflows/provision.yml b/.github/workflows/provision.yml
@@ -9,6 +9,7 @@ on:
         default: qa
         required: true
         options:
+          - development
           - staging
           - qa
           - production
@@ -51,26 +52,8 @@ jobs:
           fetch-depth: 0
           path: './${{ github.event.repository.name }}'
 
-      - name: Set environment type ENV_TYPE
-        run: |
-          if [ "${{ github.event.inputs.environment }}" == "production" ]; then
-              echo "ENV_TYPE=production" >> "$GITHUB_ENV"
-          else
-              echo "ENV_TYPE=qa" >> "$GITHUB_ENV"
-          fi
-
-      - name: Setup PEM file
-        # Secret didn't work directly in the if condition
-        env:
-          SSH_KEY: ${{ secrets.SSH_KEY }}
-        if: ${{ env.SSH_KEY }}
-        run: |
-          echo "${{ secrets.SSH_KEY }}" > /tmp/server.pem
-          chmod 600 /tmp/server.pem
-
       - name: Set variables for ansible in production environments
-        id: ansible-production-variables
-        if: env.ENV_TYPE == 'production'
+        id: ansible-variables
         run: |
           JSON_WITH_NEWLINES=$(cat<<EOF
             ${{ toJSON(env) }}
@@ -93,24 +76,6 @@ jobs:
           manager_production_server_ip: ${{ secrets.SSH_HOST }}
           ansible_user: ${{ secrets.SSH_USER }}
 
-      - name: Set variables for ansible in qa environments
-        id: ansible-variables
-        if: env.ENV_TYPE == 'qa'
-        run: |
-          JSON_WITH_NEWLINES=$(cat<<EOF
-            ${{ toJSON(env) }}
-          EOF)
-          JSON_WITHOUT_NEWLINES=$(echo $JSON_WITH_NEWLINES | jq -R -c .)
-          echo "EXTRA_VARS=$JSON_WITHOUT_NEWLINES" >> $GITHUB_OUTPUT
-        env:
-          encrypted_disk_size: ${{ vars.DISK_SPACE }}
-          disk_encryption_key: ${{ secrets.ENCRYPTION_KEY }}
-          dockerhub_username: ${{ secrets.DOCKER_USERNAME }}
-          dockerhub_password: ${{ secrets.DOCKER_TOKEN }}
-          mongodb_admin_username: ${{ secrets.MONGODB_ADMIN_USER }}
-          mongodb_admin_password: ${{ secrets.MONGODB_ADMIN_PASSWORD }}
-          elasticsearch_superuser_password: ${{ secrets.ELASTICSEARCH_SUPERUSER_PASSWORD }}
-
       - name: Read known hosts
         run: |
           cd ${{ github.event.repository.name }}
@@ -136,6 +101,6 @@ jobs:
           directory: ${{ github.event.repository.name }}/infrastructure/server-setup
           options: |
             --verbose
-            --inventory ${{ github.event.inputs.environment }}.ini
+            --inventory ${{ github.event.inputs.environment }}.yml
             ${{ inputs.tag != 'all' && format('--tags={0}', inputs.tag) || ''}}
             --extra-vars ""${{ steps.ansible-variables.outputs.EXTRA_VARS }}""
diff --git a/.gitignore b/.gitignore
@@ -32,3 +32,4 @@ graphql.schema.json
 *.tar.gz
 9. config: Translations
 *.xlsx
+.secrets
diff --git a/infrastructure/.known-hosts b/infrastructure/.known-hosts
@@ -10,3 +10,10 @@
 |1|mmWxyVhdNt+9vCZY8YSu/b5T6mI=|oWUySmyU/yK3gMAgrMpcfutjats= ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBEp49NpGjmoCmYAHnNbZF6dpo0G3L3Z3m++B4Pq3sVUTLwMuNv4WfoebiSJH20tcTq92XbFV5NfCmdnfoksr/1Y=
 |1|EWKHZMaMYdiCWDSqV8DsOmqFJ3c=|GQ0ApYEAoubxL2n9VFMY5cnN8Yc= ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDJkWafUYUyF1eOzj1WqhjwJc+TvMjKmz0bCqtci5BMNUsn+R+Z+CIOPvI8eqYEzXiJ7VGAZq1twRYGSnRTJyCja3eJfvQfxb8hGVz2fkf9rthgYABdoHSJoGMTt4EP2LtTduzvLPCBctiID6bXUFMkM6j2pmLQK/gZGEKNaJb86D7xt1HXQsqV5bAAKCaehgn6LAQ8zee9YZtoP8fwhoorTJEJ3kpsvsneEpV3kiuAPdyfB8zI7E3HHqXgD+ij0eFogK+NSUIMUexFyRZgAtKDBjnNRQLGMEzY1UzM7pojRr8Bb9vT4tGJGBpzfWvWn6WavIpBa3Ht6sXmXHGexGn2X8gyG5rHif2FAmTV7O4M+sBlpxqr7G906BJ8JwOl8qp8T9BnesWiExFdeDwzsRPS49KQOBpxOqfK5OC1ZQlEzVIR1SQpOAGjDgGM1XtR4jsBX6OBlR7hcYSw9F6wCWjrWFrmv6HVNAXZgYsnzXQmJPpDbRQAyHTvIHK9/DobQI8=
 |1|FuRTlvDs4p17HjsAIGQ7wQml0TM=|qDsBKG5gV6TDM2dw0lykGLS+11M= ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIO/ZvINySxP0MXtHBbaJ6FqDBaFUl/YVAyUItqfiyeez
+# Farajaland development
+|1|HDuiYEmDGno6Qcs8u1cpZRhZ2+4=|rOmBlnsU8fhz+rvrhYsxuaxoYdw= ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHZVo8Jsqw6akzCRm8ID0zd2OAxU5NeOvS/iE3win98w
+|1|Mn/W3dDtZHMVIBfAFoDM2O6imh0=|Xh0YgKB9aMgqwpcW5sGQ7bwaKqw= ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHZVo8Jsqw6akzCRm8ID0zd2OAxU5NeOvS/iE3win98w
+|1|tAUs/oZqV0DzGk2O5FYIt82cnPk=|MH0OH93IaaS133rnrVg7Iu6H9lU= ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDWFbOMgypl/mCjtTbnYQl4CRMxV/pp/7FupLnVnabFFeBv5OECrFTku3zV1n2hmbQZNJdO3gREQeV67olSBg554wp8CLJoE2l0SV1Gg56zz58H79Smhl2dnSZEtEELr5NqZ6cFWa7mwXEfS0Xp+oaWbc+ieLcQcC58l6HE8K/ygBzqNhgHqSJsY7PFmk+UFnbaF6zDqF5I4SJ6LP3299SPtzxrAkxuo4UM/QETDfjj/oc42XqKa3anzbk8rtupVETm/h8akx5D4XzGaSjENpAj9IGFUNg6oiLsw6GeWPTQTf1b7exsWs0y95yTIxWB8o/0XE9vauftICsEgThkmp+XZW81uhLmGKEsKzf9Leil6U3fkYkNeEf4V9DjisEWwq89Q31hOWnilbgEJbb5u+l+aeEK/MKeo2Epx0SZckLwo3YmL6vM00ykIzqrS3ERw/K1GGSmZtBIplDALJWLt0OZR3vwnktR/4oj6+Iy1PuIa9i+bw0OVo8ScolgRHxZok8=
+|1|EnE18GaKM2Ymvhe7nzilrncK59o=|gon3Vv+SSHdKpAqvQvtiAxdGG3U= ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDWFbOMgypl/mCjtTbnYQl4CRMxV/pp/7FupLnVnabFFeBv5OECrFTku3zV1n2hmbQZNJdO3gREQeV67olSBg554wp8CLJoE2l0SV1Gg56zz58H79Smhl2dnSZEtEELr5NqZ6cFWa7mwXEfS0Xp+oaWbc+ieLcQcC58l6HE8K/ygBzqNhgHqSJsY7PFmk+UFnbaF6zDqF5I4SJ6LP3299SPtzxrAkxuo4UM/QETDfjj/oc42XqKa3anzbk8rtupVETm/h8akx5D4XzGaSjENpAj9IGFUNg6oiLsw6GeWPTQTf1b7exsWs0y95yTIxWB8o/0XE9vauftICsEgThkmp+XZW81uhLmGKEsKzf9Leil6U3fkYkNeEf4V9DjisEWwq89Q31hOWnilbgEJbb5u+l+aeEK/MKeo2Epx0SZckLwo3YmL6vM00ykIzqrS3ERw/K1GGSmZtBIplDALJWLt0OZR3vwnktR/4oj6+Iy1PuIa9i+bw0OVo8ScolgRHxZok8=
+|1|12gTsp66sVImqDWOlvPjkcpCQq4=|ETbKnsuLe+4YbTCEC/3P46AN/CE= ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBC6FQAe/NJr47AbOwedQoK9+pIgaiBte1c66fLTSsNnWiBEvte4JL4ar+DHtbjhE8Huzui+Bn9U/JFo/VzgTWzQ=
+|1|f96Se5EQQt03o+9o17PPmpQLaB8=|ao3mjUl8K0VpfL3sLuCYKc7bjV8= ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBC6FQAe/NJr47AbOwedQoK9+pIgaiBte1c66fLTSsNnWiBEvte4JL4ar+DHtbjhE8Huzui+Bn9U/JFo/VzgTWzQ=