From 36080d75b46763ca0f67351153a3519e1e89ff11 Mon Sep 17 00:00:00 2001 From: Riku Rouvila Date: Wed, 27 Sep 2023 08:07:30 +0300 Subject: [PATCH 01/10] add scripts for creating and restoring development snapshots --- .gitignore | 3 +- infrastructure/emergency-backup-metadata.sh | 66 +++++++++++++++++++-- infrastructure/restore-snapshot.sh | 63 ++++++++++++++++++++ package.json | 4 +- 4 files changed, 128 insertions(+), 8 deletions(-) create mode 100755 infrastructure/restore-snapshot.sh diff --git a/.gitignore b/.gitignore index b38111404..62e19ed10 100644 --- a/.gitignore +++ b/.gitignore @@ -28,4 +28,5 @@ src/tests/locations.json cypress/screenshots cypress/videos -graphql.schema.json \ No newline at end of file +graphql.schema.json +*.tar.gz \ No newline at end of file diff --git a/infrastructure/emergency-backup-metadata.sh b/infrastructure/emergency-backup-metadata.sh index bce79bcd6..40945b5be 100755 --- a/infrastructure/emergency-backup-metadata.sh +++ b/infrastructure/emergency-backup-metadata.sh @@ -113,7 +113,15 @@ else ROOT_PATH=$(cd "$ROOT_PATH" && pwd) fi +# Find and remove all empty subdirectories under the top-level directories +for BACKUP_DIR in $ROOT_PATH/backups/*; do + if [ -d "$BACKUP_DIR" ]; then + rm -rf $BACKUP_DIR/* + fi +done + mkdir -p $ROOT_PATH/backups/elasticsearch +mkdir -p $ROOT_PATH/backups/elasticsearch/indices mkdir -p $ROOT_PATH/backups/influxdb mkdir -p $ROOT_PATH/backups/mongo mkdir -p $ROOT_PATH/backups/minio @@ -163,6 +171,15 @@ elasticsearch_host() { fi } +# Do not include OpenHIM transactions for local snapshots +excluded_collections() { + if [ "$IS_LOCAL" = true ]; then + echo "--excludeCollection=transactions" + else + echo "" + fi +} + # Today's date is used for filenames if LABEL is not provided #----------------------------------- BACKUP_DATE=$(date +%Y-%m-%d) @@ -172,7 +189,7 @@ BACKUP_DATE=$(date +%Y-%m-%d) docker run --rm -v $ROOT_PATH/backups/mongo:/data/backups/mongo --network=$NETWORK mongo:4.4 bash \ -c "mongodump $(mongo_credentials) --host $HOST -d hearth-dev --gzip --archive=/data/backups/mongo/hearth-dev-${LABEL:-$BACKUP_DATE}.gz" docker run --rm -v $ROOT_PATH/backups/mongo:/data/backups/mongo --network=$NETWORK mongo:4.4 bash \ - -c "mongodump $(mongo_credentials) --host $HOST -d openhim-dev --gzip --archive=/data/backups/mongo/openhim-dev-${LABEL:-$BACKUP_DATE}.gz" + -c "mongodump $(mongo_credentials) --host $HOST -d openhim-dev $(excluded_collections) --gzip --archive=/data/backups/mongo/openhim-dev-${LABEL:-$BACKUP_DATE}.gz" docker run --rm -v $ROOT_PATH/backups/mongo:/data/backups/mongo --network=$NETWORK mongo:4.4 bash \ -c "mongodump $(mongo_credentials) --host $HOST -d user-mgnt --gzip --archive=/data/backups/mongo/user-mgnt-${LABEL:-$BACKUP_DATE}.gz" docker run --rm -v $ROOT_PATH/backups/mongo:/data/backups/mongo --network=$NETWORK mongo:4.4 bash \ @@ -184,14 +201,49 @@ docker run --rm -v $ROOT_PATH/backups/mongo:/data/backups/mongo --network=$NETWO docker run --rm -v $ROOT_PATH/backups/mongo:/data/backups/mongo --network=$NETWORK mongo:4.4 bash \ -c "mongodump $(mongo_credentials) --host $HOST -d performance --gzip --archive=/data/backups/mongo/performance-${LABEL:-$BACKUP_DATE}.gz" -# Register backup folder as an Elasticsearch repository for backing up the search data + +#------------------------------------------------------------------------------------- + +echo "" +echo "Delete all currently existing snapshots" +echo "" +docker run --rm --network=$NETWORK appropriate/curl curl -a -X DELETE -H "Content-Type: application/json;charset=UTF-8" "http://$(elasticsearch_host)/_snapshot/ocrvs" + #------------------------------------------------------------------------------------- -docker run --rm --network=$NETWORK appropriate/curl curl -X PUT -H "Content-Type: application/json;charset=UTF-8" "http://$(elasticsearch_host)/_snapshot/ocrvs" -d '{ "type": "fs", "settings": { "location": "/data/backups/elasticsearch", "compress": true }}' +echo "" +echo "Register backup folder as an Elasticsearch repository for backing up the search data" +echo "" + +create_elasticsearch_snapshot_repository() { + OUTPUT=$(docker run --rm --network=opencrvs_default appropriate/curl curl -s -X PUT -H "Content-Type: application/json;charset=UTF-8" "http://$(elasticsearch_host)/_snapshot/ocrvs" -d '{ "type": "fs", "settings": { "location": "/data/backups/elasticsearch", "compress": true }}' 2>/dev/null) + while [ "$OUTPUT" != '{"acknowledged":true}' ]; do + echo "Failed to register backup folder as an Elasticsearch repository. Trying again in..." + sleep 1 + create_elasticsearch_snapshot_repository + done +} + +create_elasticsearch_snapshot_repository -sleep 10 -# Backup Elasticsearch as a set of snapshot files into an elasticsearch sub folder #--------------------------------------------------------------------------------- -docker run --rm --network=$NETWORK appropriate/curl curl -X PUT -H "Content-Type: application/json;charset=UTF-8" "http://$(elasticsearch_host)/_snapshot/ocrvs/snapshot_${LABEL:-$BACKUP_DATE}?wait_for_completion=true&pretty" -d '{ "indices": "ocrvs" }' + +echo "" +echo "Backup Elasticsearch as a set of snapshot files into an elasticsearch sub folder" +echo "" + +create_elasticsearch_backup() { + OUTPUT="" + OUTPUT=$(docker run --rm --network=$NETWORK appropriate/curl curl -s -X PUT -H "Content-Type: application/json;charset=UTF-8" "http://$(elasticsearch_host)/_snapshot/ocrvs/snapshot_${VERSION:-$BACKUP_DATE}?wait_for_completion=true&pretty" -d '{ "indices": "ocrvs" }' 2>/dev/null) + if echo $OUTPUT | jq -e '.snapshot.state == "SUCCESS"' > /dev/null; then + echo "Snapshot state is SUCCESS" + else + echo $OUTPUT + echo "Failed to backup Elasticsearch. Trying again in..." + create_elasticsearch_backup + fi +} + +create_elasticsearch_backup # Get the container ID and host details of any running InfluxDB container, as the only way to backup is by using the Influxd CLI inside a running opencrvs_metrics container #--------------------------------------------------------------------------------------------------------------------------------------------------------------------------- @@ -231,6 +283,8 @@ mkdir -p $ROOT_PATH/backups/minio cd $ROOT_PATH/minio && tar -zcvf $ROOT_PATH/backups/minio/ocrvs-${LABEL:-$BACKUP_DATE}.tar.gz . && cd / echo "Creating a backup for Metabase" + +mkdir -p $ROOT_PATH/metabase # This might not exist in local project if metabase has never been run mkdir -p $ROOT_PATH/backups/metabase cd $ROOT_PATH/metabase && tar -zcvf $ROOT_PATH/backups/metabase/ocrvs-${LABEL:-$BACKUP_DATE}.tar.gz . && cd / diff --git a/infrastructure/restore-snapshot.sh b/infrastructure/restore-snapshot.sh new file mode 100755 index 000000000..5b287f4bc --- /dev/null +++ b/infrastructure/restore-snapshot.sh @@ -0,0 +1,63 @@ +set -e + +# Sometimes scenarios can be passed in scenario-name/test format but we only need scenario here +ARCHIVE_PATH=$1 +OPENCRVS_CORE_PATH=$2 +# COUNTRY_CONFIG_PATH=$3 +DIR=$(pwd) +# # this function takes in a directory name and traverses from current +# # directory all to way to file system root while always checking if the directory exists +# # if it does, it returns the absolute path to the directory +# # if it doesn't, it returns an empty string + +find_directory () { + local directory=$1 + local current_directory=$(pwd) + local absolute_path="" + + while [ "$current_directory" != "/" ]; do + if [ -d "$current_directory/$directory" ]; then + absolute_path="$current_directory/$directory" + break + fi + + current_directory=$(dirname "$current_directory") + done + + echo "$absolute_path" +} + +print_usage_and_exit () { + echo "Usage: $0 " + exit 1 +} + +if [ -z "$ARCHIVE_PATH" ]; then + print_usage_and_exit +fi + +if [ -z "$OPENCRVS_CORE_PATH" ]; then + EXISTING_OPENCRVS_CORE_PATH=$(find_directory opencrvs-core) + if [ -d "$EXISTING_OPENCRVS_CORE_PATH" ]; then + OPENCRVS_CORE_PATH=$EXISTING_OPENCRVS_CORE_PATH + echo "Automatically detected opencrvs-core at $EXISTING_OPENCRVS_CORE_PATH" + else + print_usage_and_exit + fi +fi + +echo "Restoring backup '$ARCHIVE_PATH'" + + +for BACKUP_DIR in $OPENCRVS_CORE_PATH/data/backups/*; do + if [ -d "$BACKUP_DIR" ]; then + rm -rf $BACKUP_DIR/* + fi +done + +cat $ARCHIVE_PATH | tar -xzf - -C $OPENCRVS_CORE_PATH/data/backups + +# Automatically detect the label +LABEL=$(ls -t $OPENCRVS_CORE_PATH/data/backups/influxdb | head -n 1) + +yes | bash $DIR/infrastructure/emergency-restore-metadata.sh --label=$LABEL --replicas=1 diff --git a/package.json b/package.json index 3d28725e6..9cd089fe8 100644 --- a/package.json +++ b/package.json @@ -25,7 +25,9 @@ "compose:push:release": "export COUNTRY_CONFIG_VERSION=`git describe --tags --abbrev=0` && bash build-and-push.sh && unset COUNTRY_CONFIG_VERSION", "data-generator": "ts-node -r tsconfig-paths/register -T src/data-generator/index.ts", "data-generator:generate-types": "graphql-codegen --config codegen.yml && yarn prettier --write src/data-generator/gateway.ts", - "deploy": "bash infrastructure/deploy.sh" + "deploy": "bash infrastructure/deploy.sh", + "restore-snapshot": "bash infrastructure/restore-snapshot.sh", + "snapshot": "bash infrastructure/emergency-backup-metadata.sh" }, "devDependencies": { "@graphql-codegen/add": "^3.1.1", From 8a9685e9b380d938fa795a8014aaaea86aaf714c Mon Sep 17 00:00:00 2001 From: Riku Rouvila Date: Mon, 2 Oct 2023 08:23:23 +0300 Subject: [PATCH 02/10] add a port forwarding script for exposing deployed containers to local ports --- infrastructure/port-forward.sh | 43 ++++++++++++++++++++++++++++++++++ package.json | 3 ++- 2 files changed, 45 insertions(+), 1 deletion(-) create mode 100755 infrastructure/port-forward.sh diff --git a/infrastructure/port-forward.sh b/infrastructure/port-forward.sh new file mode 100755 index 000000000..12432930e --- /dev/null +++ b/infrastructure/port-forward.sh @@ -0,0 +1,43 @@ +#!/bin/bash +set -euo pipefail + +# ANSI color codes +RED='\033[0;31m' +GREEN='\033[0;32m' +YELLOW='\033[0;33m' +NC='\033[0m' # No Color + +if [ "$#" -ne 3 ]; then + echo -e "${RED}Usage: ./port-forward ${NC}" + exit 1 +fi + +TARGET_SERVER="$1" +CONTAINER_PORT="$2" +LOCAL_PORT="$3" + +TARGET_CONTAINER_NAME=$(echo $CONTAINER_PORT | cut -d: -f1) +PORT=$(echo $CONTAINER_PORT | cut -d: -f2) + +# Generate the socat container's name +CONTAINER_NAME="tunnel_${TARGET_CONTAINER_NAME}_$(whoami)" + +# Generate a random port between 30000 and 60000 for socat inside the host machine +SOCAT_PORT=$(( 30000 + RANDOM % 30001 )) + +echo -e "${YELLOW}Setting up port forwarding...${NC}" +echo -e "Local Port: ${GREEN}$LOCAL_PORT${NC}" +echo -e "Target Server: ${GREEN}$TARGET_SERVER${NC}" +echo -e "Container and Port: ${GREEN}$TARGET_CONTAINER_NAME:$PORT${NC}" +echo -e "Internal socat Port on Host: ${GREEN}$SOCAT_PORT${NC}" +echo -e "Socat Container Name: ${GREEN}$CONTAINER_NAME${NC}" + +ssh -tL $LOCAL_PORT:localhost:$SOCAT_PORT root@$TARGET_SERVER \ +'docker run --rm --name '$CONTAINER_NAME' --network=opencrvs_overlay_net --publish '$SOCAT_PORT:$SOCAT_PORT' alpine/socat tcp-listen:'$SOCAT_PORT',fork,reuseaddr tcp-connect:'$TARGET_CONTAINER_NAME:$PORT'' + +echo -e "${GREEN}Port forwarding established and tunnel is online! Press Ctrl+C to close.${NC}" + +# Keep the script running so that the trap can catch the Ctrl+C +while true; do + sleep 1 +done \ No newline at end of file diff --git a/package.json b/package.json index 3d28725e6..7a84e36c4 100644 --- a/package.json +++ b/package.json @@ -25,7 +25,8 @@ "compose:push:release": "export COUNTRY_CONFIG_VERSION=`git describe --tags --abbrev=0` && bash build-and-push.sh && unset COUNTRY_CONFIG_VERSION", "data-generator": "ts-node -r tsconfig-paths/register -T src/data-generator/index.ts", "data-generator:generate-types": "graphql-codegen --config codegen.yml && yarn prettier --write src/data-generator/gateway.ts", - "deploy": "bash infrastructure/deploy.sh" + "deploy": "bash infrastructure/deploy.sh", + "port-forward": "bash infrastructure/port-forward.sh" }, "devDependencies": { "@graphql-codegen/add": "^3.1.1", From 6308b6377c4a8b852cb2f87bd778b3f793d66f5f Mon Sep 17 00:00:00 2001 From: Riku Rouvila Date: Mon, 2 Oct 2023 14:56:45 +0300 Subject: [PATCH 03/10] remove infinite loop --- infrastructure/port-forward.sh | 5 ----- 1 file changed, 5 deletions(-) diff --git a/infrastructure/port-forward.sh b/infrastructure/port-forward.sh index 12432930e..59b8014bd 100755 --- a/infrastructure/port-forward.sh +++ b/infrastructure/port-forward.sh @@ -36,8 +36,3 @@ ssh -tL $LOCAL_PORT:localhost:$SOCAT_PORT root@$TARGET_SERVER \ 'docker run --rm --name '$CONTAINER_NAME' --network=opencrvs_overlay_net --publish '$SOCAT_PORT:$SOCAT_PORT' alpine/socat tcp-listen:'$SOCAT_PORT',fork,reuseaddr tcp-connect:'$TARGET_CONTAINER_NAME:$PORT'' echo -e "${GREEN}Port forwarding established and tunnel is online! Press Ctrl+C to close.${NC}" - -# Keep the script running so that the trap can catch the Ctrl+C -while true; do - sleep 1 -done \ No newline at end of file From fb5736dfae4ec714ce0c6e84797adb663df17bec Mon Sep 17 00:00:00 2001 From: euanmillar Date: Mon, 2 Oct 2023 16:10:44 +0100 Subject: [PATCH 04/10] Update licence --- .github/workflows/deploy-prod.yml | 2 +- .github/workflows/deploy.yml | 2 +- .github/workflows/generate-demo-data.yml | 3 +-- LICENSE | 3 +-- build-and-push.sh | 3 +-- clear-all-data.sh | 3 +-- cypress/integration/advancedsearch.spec.ts | 3 +-- cypress/integration/birth.spec.ts | 3 +-- cypress/integration/certificate.spec.ts | 21 +++++++++---------- cypress/integration/correct-record.spec.ts | 3 +-- cypress/integration/death.spec.ts | 3 +-- cypress/integration/menu.spec.ts | 6 ++---- cypress/integration/search.spec.ts | 3 +-- cypress/integration/team.spec.ts | 3 +-- cypress/integration/user.spec.ts | 3 +-- cypress/plugins/index.js | 3 +-- cypress/support/commands.ts | 3 +-- cypress/support/fetch_to_xhr.js | 3 +-- cypress/support/index.d.ts | 3 +-- cypress/support/index.js | 3 +-- docker-compose.yml | 3 +-- infrastructure/clear-all-data.sh | 3 +-- infrastructure/cryptfs/bootstrap.sh | 3 +-- infrastructure/cryptfs/mount.sh | 3 +-- infrastructure/cryptfs/umount.sh | 3 +-- infrastructure/decrypt.sh | 3 +-- infrastructure/deploy.sh | 3 +-- ...cker-compose.countryconfig.demo-deploy.yml | 3 +-- ...ose.countryconfig.mosip-example-deploy.yml | 3 +-- ...cker-compose.countryconfig.prod-deploy.yml | 3 +-- ...docker-compose.countryconfig.qa-deploy.yml | 3 +-- ...ocker-compose.countryconfig.replicas-1.yml | 3 +-- ...ocker-compose.countryconfig.replicas-3.yml | 3 +-- ...ocker-compose.countryconfig.replicas-5.yml | 3 +-- ...r-compose.countryconfig.staging-deploy.yml | 3 +-- infrastructure/docker-compose.deploy.yml | 3 +-- infrastructure/docker-compose.prod-deploy.yml | 3 +-- infrastructure/docker-compose.qa-deploy.yml | 3 +-- infrastructure/docker-compose.replicas-3.yml | 3 +-- infrastructure/docker-compose.replicas-5.yml | 3 +-- .../docker-compose.staging-deploy.yml | 3 +-- infrastructure/elasticsearch/setup-helpers.sh | 3 +-- .../elasticsearch/setup-settings.sh | 3 +-- infrastructure/elasticsearch/setup-users.sh | 3 +-- infrastructure/elasticsearch/setup.sh | 3 +-- infrastructure/emergency-backup-metadata.sh | 3 +-- infrastructure/emergency-restore-metadata.sh | 3 +-- .../hearth-plugins/checkDuplicateTask.js | 3 +-- infrastructure/influxdb.conf | 3 +-- infrastructure/logrotate.conf | 3 +-- infrastructure/mongodb/on-deploy.sh | 3 +-- infrastructure/monitoring/apm/apm-server.yml | 3 +-- .../monitoring/beats/metricbeat.yml | 3 +-- .../monitoring/elastalert/auth.yaml | 3 +-- .../monitoring/elastalert/elastalert.yaml | 3 +-- .../monitoring/elastalert/rules/alert.yaml | 3 +-- .../elastalert/rules/service-error.yaml | 3 +-- infrastructure/monitoring/kibana/kibana.yml | 3 +-- .../monitoring/logstash/logstash.yml | 3 +-- infrastructure/rotate-secrets.sh | 3 +-- infrastructure/run-migrations.sh | 3 +-- infrastructure/server-setup/example-1.ini | 3 +-- infrastructure/server-setup/example-3.ini | 3 +-- infrastructure/server-setup/example-5.ini | 3 +-- .../server-setup/group_vars/all.yml | 3 +-- infrastructure/server-setup/playbook-1.yml | 3 +-- infrastructure/server-setup/playbook-3.yml | 3 +-- infrastructure/server-setup/playbook-5.yml | 3 +-- infrastructure/setup-deploy-config.sh | 3 +-- package.json | 2 +- src/api/application/country-logo.ts | 3 +-- src/api/application/handler.ts | 3 +-- src/api/content/handler.test.ts | 3 +-- src/api/content/handler.ts | 3 +-- src/api/content/service.ts | 3 +-- src/api/dashboard-map/handler.ts | 3 +-- src/api/data-generator/handler.ts | 3 +-- src/api/data-generator/service.ts | 3 +-- src/api/event-registration/handler.ts | 3 +-- src/api/event-registration/service.ts | 3 +-- .../mosip-openhim-mediator/handler.ts | 3 +-- src/api/notification/email-service.ts | 3 +-- src/api/notification/handler.ts | 3 +-- src/api/notification/sms-service.ts | 3 +-- src/client-config.js | 3 +-- src/client-config.prod.js | 3 +-- src/constants.ts | 3 +-- src/data-generator/birthNotification.ts | 3 +-- src/data-generator/options.ts | 3 +-- src/data-seeding/certificates/handler.ts | 3 +-- src/data-seeding/employees/handler.ts | 3 +-- src/data-seeding/locations/handler.ts | 3 +-- src/data-seeding/roles/handler.ts | 3 +-- src/data-seeding/roles/validator.ts | 3 +-- src/form/addresses/index.ts | 3 +-- src/form/birth/certificate-handlebars.ts | 3 +-- src/form/birth/index.ts | 3 +-- src/form/birth/optional-fields.ts | 3 +-- src/form/birth/required-fields.ts | 3 +-- src/form/common/common-optional-fields.ts | 3 +-- src/form/common/common-required-fields.ts | 3 +-- .../custom-validators.ts | 3 +-- .../common/default-validation-conditionals.ts | 3 +-- src/form/common/messages.ts | 3 +-- src/form/common/preview-groups.ts | 3 +-- src/form/common/select-options.ts | 3 +-- src/form/custom-fields.ts | 3 +-- src/form/death/certficate-handlebars.ts | 3 +-- src/form/death/index.ts | 3 +-- src/form/death/required-fields.ts | 3 +-- src/form/index.ts | 3 +-- src/form/marriage/certificate-handlebars.ts | 3 +-- src/form/marriage/index.ts | 3 +-- src/form/marriage/optional-fields.ts | 3 +-- src/form/marriage/required-fields.ts | 3 +-- src/form/types/types.ts | 3 +-- src/form/types/validators.ts | 3 +-- src/index.test.ts | 3 +-- src/index.ts | 3 +-- src/logger.ts | 3 +-- src/login-config.js | 3 +-- src/login-config.prod.js | 3 +-- src/tests/util.ts | 3 +-- src/utils/address-utils.ts | 3 +-- src/utils/index.ts | 3 +-- src/utils/mapping/field-mapping-utils.ts | 3 +-- .../mapping/section/birth/mapping-utils.ts | 3 +-- .../mapping/section/death/mapping-utils.ts | 3 +-- .../mapping/section/marriage/mapping-utils.ts | 3 +-- src/validate-translations.ts | 3 +-- start-prod.sh | 3 +-- test/cert.key.pub | 3 +-- test/setupJest.ts | 3 +-- typings/country-data.d.ts | 3 +-- typings/hapi-sentry.d.ts | 3 +-- typings/niceware.d.ts | 3 +-- typings/pdfmake.d.ts | 3 +-- 137 files changed, 147 insertions(+), 282 deletions(-) diff --git a/.github/workflows/deploy-prod.yml b/.github/workflows/deploy-prod.yml index 0ed52a754..5443162e7 100644 --- a/.github/workflows/deploy-prod.yml +++ b/.github/workflows/deploy-prod.yml @@ -13,7 +13,7 @@ on: core-image-tag: description: Core DockerHub image tag required: true - default: 'v1.2.0' + default: 'v1.3.0' countryconfig-image-tag: description: Your Country Config DockerHub image tag required: true diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index c5852a1c6..62f844486 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -14,7 +14,7 @@ on: core-image-tag: description: Core DockerHub image tag required: true - default: 'v1.2.0' + default: 'v1.3.0' countryconfig-image-tag: description: Your Country Config DockerHub image tag required: true diff --git a/.github/workflows/generate-demo-data.yml b/.github/workflows/generate-demo-data.yml index d8cdabbb4..9ab7fb25b 100644 --- a/.github/workflows/generate-demo-data.yml +++ b/.github/workflows/generate-demo-data.yml @@ -5,8 +5,7 @@ # OpenCRVS is also distributed under the terms of the Civil Registration # & Healthcare Disclaimer located at http://opencrvs.org/license. # -# Copyright (C) The OpenCRVS Authors. OpenCRVS and the OpenCRVS -# graphic logo are (registered/a) trademark(s) of Plan International. +# Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS. name: Generate demo data on: diff --git a/LICENSE b/LICENSE index 5c47ad04f..f9444f531 100644 --- a/LICENSE +++ b/LICENSE @@ -420,5 +420,4 @@ Exhibit B - "Incompatible With Secondary Licenses" Notice OpenCRVS is also distributed under the terms of the Civil Registration & Healthcare Disclaimer located at http://opencrvs.org/license. -Copyright (C) The OpenCRVS Authors. OpenCRVS and the OpenCRVS -graphic logo are (registered/a) trademark(s) of Plan International. \ No newline at end of file +Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS. \ No newline at end of file diff --git a/build-and-push.sh b/build-and-push.sh index c069742d0..59ab4607c 100755 --- a/build-and-push.sh +++ b/build-and-push.sh @@ -6,8 +6,7 @@ # OpenCRVS is also distributed under the terms of the Civil Registration # & Healthcare Disclaimer located at http://opencrvs.org/license. # -# Copyright (C) The OpenCRVS Authors. OpenCRVS and the OpenCRVS -# graphic logo are (registered/a) trademark(s) of Plan International. +# Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS. set -e docker-compose build diff --git a/clear-all-data.sh b/clear-all-data.sh index a8bd43e28..e4583ce8e 100755 --- a/clear-all-data.sh +++ b/clear-all-data.sh @@ -5,8 +5,7 @@ # OpenCRVS is also distributed under the terms of the Civil Registration # & Healthcare Disclaimer located at http://opencrvs.org/license. # -# Copyright (C) The OpenCRVS Authors. OpenCRVS and the OpenCRVS -# graphic logo are (registered/a) trademark(s) of Plan International. +# Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS. print_usage_and_exit () { echo 'Usage: ./clear-all-data.sh --path_to_core=XXX' echo "This script clears all OpenCRVS data locally. To run it you must pass the directory path to opencrvs-core." diff --git a/cypress/integration/advancedsearch.spec.ts b/cypress/integration/advancedsearch.spec.ts index e6b362a53..cbc085a31 100644 --- a/cypress/integration/advancedsearch.spec.ts +++ b/cypress/integration/advancedsearch.spec.ts @@ -6,8 +6,7 @@ * OpenCRVS is also distributed under the terms of the Civil Registration * & Healthcare Disclaimer located at http://opencrvs.org/license. * - * Copyright (C) The OpenCRVS Authors. OpenCRVS and the OpenCRVS - * graphic logo are (registered/a) trademark(s) of Plan International. + * Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS. */ /// diff --git a/cypress/integration/birth.spec.ts b/cypress/integration/birth.spec.ts index 048b4d6e5..8b7df746d 100644 --- a/cypress/integration/birth.spec.ts +++ b/cypress/integration/birth.spec.ts @@ -6,8 +6,7 @@ * OpenCRVS is also distributed under the terms of the Civil Registration * & Healthcare Disclaimer located at http://opencrvs.org/license. * - * Copyright (C) The OpenCRVS Authors. OpenCRVS and the OpenCRVS - * graphic logo are (registered/a) trademark(s) of Plan International. + * Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS. */ import faker from "@faker-js/faker" diff --git a/cypress/integration/certificate.spec.ts b/cypress/integration/certificate.spec.ts index 9464a84f6..440980694 100644 --- a/cypress/integration/certificate.spec.ts +++ b/cypress/integration/certificate.spec.ts @@ -1,14 +1,13 @@ -// /* -// * This Source Code Form is subject to the terms of the Mozilla Public -// * License, v. 2.0. If a copy of the MPL was not distributed with this -// * file, You can obtain one at https://mozilla.org/MPL/2.0/. -// * -// * OpenCRVS is also distributed under the terms of the Civil Registration -// * & Healthcare Disclaimer located at http://opencrvs.org/license. -// * -// * Copyright (C) The OpenCRVS Authors. OpenCRVS and the OpenCRVS -// * graphic logo are (registered/a) trademark(s) of Plan International. -// */ +/* + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + * + * OpenCRVS is also distributed under the terms of the Civil Registration + * & Healthcare Disclaimer located at http://opencrvs.org/license. + * + * Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS. + */ /// diff --git a/cypress/integration/correct-record.spec.ts b/cypress/integration/correct-record.spec.ts index e8931646a..94235d297 100644 --- a/cypress/integration/correct-record.spec.ts +++ b/cypress/integration/correct-record.spec.ts @@ -6,8 +6,7 @@ * OpenCRVS is also distributed under the terms of the Civil Registration * & Healthcare Disclaimer located at http://opencrvs.org/license. * - * Copyright (C) The OpenCRVS Authors. OpenCRVS and the OpenCRVS - * graphic logo are (registered/a) trademark(s) of Plan International. + * Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS. */ /// diff --git a/cypress/integration/death.spec.ts b/cypress/integration/death.spec.ts index d3bed5d8b..7a1b0f3e7 100644 --- a/cypress/integration/death.spec.ts +++ b/cypress/integration/death.spec.ts @@ -6,8 +6,7 @@ * OpenCRVS is also distributed under the terms of the Civil Registration * & Healthcare Disclaimer located at http://opencrvs.org/license. * - * Copyright (C) The OpenCRVS Authors. OpenCRVS and the OpenCRVS - * graphic logo are (registered/a) trademark(s) of Plan International. + * Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS. */ /// import faker from '@faker-js/faker' diff --git a/cypress/integration/menu.spec.ts b/cypress/integration/menu.spec.ts index aa9cdbbe0..1e2f11e8a 100644 --- a/cypress/integration/menu.spec.ts +++ b/cypress/integration/menu.spec.ts @@ -6,8 +6,7 @@ * OpenCRVS is also distributed under the terms of the Civil Registration * & Healthcare Disclaimer located at http://opencrvs.org/license. * - * Copyright (C) The OpenCRVS Authors. OpenCRVS and the OpenCRVS - * graphic logo are (registered/a) trademark(s) of Plan International. + * Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS. */ /* * This Source Code Form is subject to the terms of the Mozilla Public @@ -17,8 +16,7 @@ * OpenCRVS is also distributed under the terms of the Civil Registration * & Healthcare Disclaimer located at http://opencrvs.org/license. * - * Copyright (C) The OpenCRVS Authors. OpenCRVS and the OpenCRVS - * graphic logo are (registered/a) trademark(s) of Plan International. + * Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS. */ /// diff --git a/cypress/integration/search.spec.ts b/cypress/integration/search.spec.ts index f488458f4..e47fc872e 100644 --- a/cypress/integration/search.spec.ts +++ b/cypress/integration/search.spec.ts @@ -6,8 +6,7 @@ * OpenCRVS is also distributed under the terms of the Civil Registration * & Healthcare Disclaimer located at http://opencrvs.org/license. * - * Copyright (C) The OpenCRVS Authors. OpenCRVS and the OpenCRVS - * graphic logo are (registered/a) trademark(s) of Plan International. + * Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS. */ /// diff --git a/cypress/integration/team.spec.ts b/cypress/integration/team.spec.ts index c590b1caa..22f06a93c 100644 --- a/cypress/integration/team.spec.ts +++ b/cypress/integration/team.spec.ts @@ -6,8 +6,7 @@ * OpenCRVS is also distributed under the terms of the Civil Registration * & Healthcare Disclaimer located at http://opencrvs.org/license. * - * Copyright (C) The OpenCRVS Authors. OpenCRVS and the OpenCRVS - * graphic logo are (registered/a) trademark(s) of Plan International. + * Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS. */ /// diff --git a/cypress/integration/user.spec.ts b/cypress/integration/user.spec.ts index 934e37058..8ef654a98 100644 --- a/cypress/integration/user.spec.ts +++ b/cypress/integration/user.spec.ts @@ -6,8 +6,7 @@ * OpenCRVS is also distributed under the terms of the Civil Registration * & Healthcare Disclaimer located at http://opencrvs.org/license. * - * Copyright (C) The OpenCRVS Authors. OpenCRVS and the OpenCRVS - * graphic logo are (registered/a) trademark(s) of Plan International. + * Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS. */ /// diff --git a/cypress/plugins/index.js b/cypress/plugins/index.js index df7ca8639..ebc407d95 100644 --- a/cypress/plugins/index.js +++ b/cypress/plugins/index.js @@ -6,8 +6,7 @@ * OpenCRVS is also distributed under the terms of the Civil Registration * & Healthcare Disclaimer located at http://opencrvs.org/license. * - * Copyright (C) The OpenCRVS Authors. OpenCRVS and the OpenCRVS - * graphic logo are (registered/a) trademark(s) of Plan International. + * Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS. */ // *********************************************************** // This example plugins/index.js can be used to load plugins diff --git a/cypress/support/commands.ts b/cypress/support/commands.ts index e73d84e81..b959de2dc 100644 --- a/cypress/support/commands.ts +++ b/cypress/support/commands.ts @@ -6,8 +6,7 @@ * OpenCRVS is also distributed under the terms of the Civil Registration * & Healthcare Disclaimer located at http://opencrvs.org/license. * - * Copyright (C) The OpenCRVS Authors. OpenCRVS and the OpenCRVS - * graphic logo are (registered/a) trademark(s) of Plan International. + * Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS. */ // *********************************************** // This example commands.js shows you how to diff --git a/cypress/support/fetch_to_xhr.js b/cypress/support/fetch_to_xhr.js index ec33bbb0d..3cb2dfea8 100644 --- a/cypress/support/fetch_to_xhr.js +++ b/cypress/support/fetch_to_xhr.js @@ -6,8 +6,7 @@ * OpenCRVS is also distributed under the terms of the Civil Registration * & Healthcare Disclaimer located at http://opencrvs.org/license. * - * Copyright (C) The OpenCRVS Authors. OpenCRVS and the OpenCRVS - * graphic logo are (registered/a) trademark(s) of Plan International. + * Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS. */ function fetchToXhr() { let polyfill diff --git a/cypress/support/index.d.ts b/cypress/support/index.d.ts index 695a8e114..2001e6477 100644 --- a/cypress/support/index.d.ts +++ b/cypress/support/index.d.ts @@ -6,8 +6,7 @@ * OpenCRVS is also distributed under the terms of the Civil Registration * & Healthcare Disclaimer located at http://opencrvs.org/license. * - * Copyright (C) The OpenCRVS Authors. OpenCRVS and the OpenCRVS - * graphic logo are (registered/a) trademark(s) of Plan International. + * Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS. */ type BirthDeclarationOptions = { firstName?: string diff --git a/cypress/support/index.js b/cypress/support/index.js index f1bd26993..1562c9826 100644 --- a/cypress/support/index.js +++ b/cypress/support/index.js @@ -6,8 +6,7 @@ * OpenCRVS is also distributed under the terms of the Civil Registration * & Healthcare Disclaimer located at http://opencrvs.org/license. * - * Copyright (C) The OpenCRVS Authors. OpenCRVS and the OpenCRVS - * graphic logo are (registered/a) trademark(s) of Plan International. + * Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS. */ // *********************************************************** // This example support/index.js is processed and diff --git a/docker-compose.yml b/docker-compose.yml index 8c8f663df..36dd21354 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -5,8 +5,7 @@ # OpenCRVS is also distributed under the terms of the Civil Registration # & Healthcare Disclaimer located at http://opencrvs.org/license. # -# Copyright (C) The OpenCRVS Authors. OpenCRVS and the OpenCRVS -# graphic logo are (registered/a) trademark(s) of Plan International. +# Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS. version: "3.3" services: diff --git a/infrastructure/clear-all-data.sh b/infrastructure/clear-all-data.sh index 77f00bfce..e3c8f0621 100755 --- a/infrastructure/clear-all-data.sh +++ b/infrastructure/clear-all-data.sh @@ -6,8 +6,7 @@ # OpenCRVS is also distributed under the terms of the Civil Registration # & Healthcare Disclaimer located at http://opencrvs.org/license. # -# Copyright (C) The OpenCRVS Authors. OpenCRVS and the OpenCRVS -# graphic logo are (registered/a) trademark(s) of Plan International. +# Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS. set -e diff --git a/infrastructure/cryptfs/bootstrap.sh b/infrastructure/cryptfs/bootstrap.sh index c14e2fc72..72933f290 100755 --- a/infrastructure/cryptfs/bootstrap.sh +++ b/infrastructure/cryptfs/bootstrap.sh @@ -6,8 +6,7 @@ # OpenCRVS is also distributed under the terms of the Civil Registration # & Healthcare Disclaimer located at http://opencrvs.org/license. # -# Copyright (C) The OpenCRVS Authors. OpenCRVS and the OpenCRVS -# graphic logo are (registered/a) trademark(s) of Plan International. +# Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS. set -e diff --git a/infrastructure/cryptfs/mount.sh b/infrastructure/cryptfs/mount.sh index 2ed102972..a0dc63bed 100755 --- a/infrastructure/cryptfs/mount.sh +++ b/infrastructure/cryptfs/mount.sh @@ -6,8 +6,7 @@ # OpenCRVS is also distributed under the terms of the Civil Registration # & Healthcare Disclaimer located at http://opencrvs.org/license. # -# Copyright (C) The OpenCRVS Authors. OpenCRVS and the OpenCRVS -# graphic logo are (registered/a) trademark(s) of Plan International. +# Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS. # defaults, use options to override FS_FILE=/cryptfs_file_sparse.img # -f, --file diff --git a/infrastructure/cryptfs/umount.sh b/infrastructure/cryptfs/umount.sh index 06fad9e89..73ab25811 100755 --- a/infrastructure/cryptfs/umount.sh +++ b/infrastructure/cryptfs/umount.sh @@ -6,8 +6,7 @@ # OpenCRVS is also distributed under the terms of the Civil Registration # & Healthcare Disclaimer located at http://opencrvs.org/license. # -# Copyright (C) The OpenCRVS Authors. OpenCRVS and the OpenCRVS -# graphic logo are (registered/a) trademark(s) of Plan International. +# Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS. # defaults, use options to override FS_FILE=/cryptfs_file_sparse.img # -f, --file diff --git a/infrastructure/decrypt.sh b/infrastructure/decrypt.sh index e358b0565..f146671c2 100755 --- a/infrastructure/decrypt.sh +++ b/infrastructure/decrypt.sh @@ -6,8 +6,7 @@ # OpenCRVS is also distributed under the terms of the Civil Registration # & Healthcare Disclaimer located at http://opencrvs.org/license. # -# Copyright (C) The OpenCRVS Authors. OpenCRVS and the OpenCRVS -# graphic logo are (registered/a) trademark(s) of Plan International. +# Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS. # defaults, use options to override FS_FILE=/cryptfs_file_sparse.img # -f, --file diff --git a/infrastructure/deploy.sh b/infrastructure/deploy.sh index 091bbc745..a91ccdf7a 100755 --- a/infrastructure/deploy.sh +++ b/infrastructure/deploy.sh @@ -5,8 +5,7 @@ # OpenCRVS is also distributed under the terms of the Civil Registration # & Healthcare Disclaimer located at http://opencrvs.org/license. # -# Copyright (C) The OpenCRVS Authors. OpenCRVS and the OpenCRVS -# graphic logo are (registered/a) trademark(s) of Plan International. +# Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS. set -e BASEDIR=$(dirname $0) diff --git a/infrastructure/docker-compose.countryconfig.demo-deploy.yml b/infrastructure/docker-compose.countryconfig.demo-deploy.yml index 8fe575b07..785a2d9e4 100644 --- a/infrastructure/docker-compose.countryconfig.demo-deploy.yml +++ b/infrastructure/docker-compose.countryconfig.demo-deploy.yml @@ -5,8 +5,7 @@ # OpenCRVS is also distributed under the terms of the Civil Registration # & Healthcare Disclaimer located at http://opencrvs.org/license. # -# Copyright (C) The OpenCRVS Authors. OpenCRVS and the OpenCRVS -# graphic logo are (registered/a) trademark(s) of Plan International. +# Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS. version: '3.3' services: diff --git a/infrastructure/docker-compose.countryconfig.mosip-example-deploy.yml b/infrastructure/docker-compose.countryconfig.mosip-example-deploy.yml index e393516fd..453bae91c 100644 --- a/infrastructure/docker-compose.countryconfig.mosip-example-deploy.yml +++ b/infrastructure/docker-compose.countryconfig.mosip-example-deploy.yml @@ -5,8 +5,7 @@ # OpenCRVS is also distributed under the terms of the Civil Registration # & Healthcare Disclaimer located at http://opencrvs.org/license. # -# Copyright (C) The OpenCRVS Authors. OpenCRVS and the OpenCRVS -# graphic logo are (registered/a) trademark(s) of Plan International. +# Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS. version: '3.3' services: diff --git a/infrastructure/docker-compose.countryconfig.prod-deploy.yml b/infrastructure/docker-compose.countryconfig.prod-deploy.yml index 50b520490..0964809db 100644 --- a/infrastructure/docker-compose.countryconfig.prod-deploy.yml +++ b/infrastructure/docker-compose.countryconfig.prod-deploy.yml @@ -5,8 +5,7 @@ # OpenCRVS is also distributed under the terms of the Civil Registration # & Healthcare Disclaimer located at http://opencrvs.org/license. # -# Copyright (C) The OpenCRVS Authors. OpenCRVS and the OpenCRVS -# graphic logo are (registered/a) trademark(s) of Plan International. +# Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS. version: '3.3' services: diff --git a/infrastructure/docker-compose.countryconfig.qa-deploy.yml b/infrastructure/docker-compose.countryconfig.qa-deploy.yml index df01d5c92..196aa3ff3 100644 --- a/infrastructure/docker-compose.countryconfig.qa-deploy.yml +++ b/infrastructure/docker-compose.countryconfig.qa-deploy.yml @@ -5,8 +5,7 @@ # OpenCRVS is also distributed under the terms of the Civil Registration # & Healthcare Disclaimer located at http://opencrvs.org/license. # -# Copyright (C) The OpenCRVS Authors. OpenCRVS and the OpenCRVS -# graphic logo are (registered/a) trademark(s) of Plan International. +# Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS. version: '3.3' services: diff --git a/infrastructure/docker-compose.countryconfig.replicas-1.yml b/infrastructure/docker-compose.countryconfig.replicas-1.yml index 3f02c8b66..d39956e5e 100644 --- a/infrastructure/docker-compose.countryconfig.replicas-1.yml +++ b/infrastructure/docker-compose.countryconfig.replicas-1.yml @@ -5,8 +5,7 @@ # OpenCRVS is also distributed under the terms of the Civil Registration # & Healthcare Disclaimer located at http://opencrvs.org/license. # -# Copyright (C) The OpenCRVS Authors. OpenCRVS and the OpenCRVS -# graphic logo are (registered/a) trademark(s) of Plan International. +# Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS. version: '3.3' services: diff --git a/infrastructure/docker-compose.countryconfig.replicas-3.yml b/infrastructure/docker-compose.countryconfig.replicas-3.yml index f0929c6d2..506cb7cb6 100644 --- a/infrastructure/docker-compose.countryconfig.replicas-3.yml +++ b/infrastructure/docker-compose.countryconfig.replicas-3.yml @@ -5,8 +5,7 @@ # OpenCRVS is also distributed under the terms of the Civil Registration # & Healthcare Disclaimer located at http://opencrvs.org/license. # -# Copyright (C) The OpenCRVS Authors. OpenCRVS and the OpenCRVS -# graphic logo are (registered/a) trademark(s) of Plan International. +# Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS. version: '3.3' services: diff --git a/infrastructure/docker-compose.countryconfig.replicas-5.yml b/infrastructure/docker-compose.countryconfig.replicas-5.yml index b9090c8c3..b97b5e77b 100644 --- a/infrastructure/docker-compose.countryconfig.replicas-5.yml +++ b/infrastructure/docker-compose.countryconfig.replicas-5.yml @@ -5,8 +5,7 @@ # OpenCRVS is also distributed under the terms of the Civil Registration # & Healthcare Disclaimer located at http://opencrvs.org/license. # -# Copyright (C) The OpenCRVS Authors. OpenCRVS and the OpenCRVS -# graphic logo are (registered/a) trademark(s) of Plan International. +# Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS. version: '3.3' services: diff --git a/infrastructure/docker-compose.countryconfig.staging-deploy.yml b/infrastructure/docker-compose.countryconfig.staging-deploy.yml index 00fe896c7..71bf40439 100644 --- a/infrastructure/docker-compose.countryconfig.staging-deploy.yml +++ b/infrastructure/docker-compose.countryconfig.staging-deploy.yml @@ -5,8 +5,7 @@ # OpenCRVS is also distributed under the terms of the Civil Registration # & Healthcare Disclaimer located at http://opencrvs.org/license. # -# Copyright (C) The OpenCRVS Authors. OpenCRVS and the OpenCRVS -# graphic logo are (registered/a) trademark(s) of Plan International. +# Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS. version: '3.3' services: diff --git a/infrastructure/docker-compose.deploy.yml b/infrastructure/docker-compose.deploy.yml index 4c606a673..f8442d7b6 100644 --- a/infrastructure/docker-compose.deploy.yml +++ b/infrastructure/docker-compose.deploy.yml @@ -5,8 +5,7 @@ # OpenCRVS is also distributed under the terms of the Civil Registration # & Healthcare Disclaimer located at http://opencrvs.org/license. # -# Copyright (C) The OpenCRVS Authors. OpenCRVS and the OpenCRVS -# graphic logo are (registered/a) trademark(s) of Plan International. +# Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS. version: '3.3' services: diff --git a/infrastructure/docker-compose.prod-deploy.yml b/infrastructure/docker-compose.prod-deploy.yml index 2552b031f..24367d806 100644 --- a/infrastructure/docker-compose.prod-deploy.yml +++ b/infrastructure/docker-compose.prod-deploy.yml @@ -5,8 +5,7 @@ # OpenCRVS is also distributed under the terms of the Civil Registration # & Healthcare Disclaimer located at http://opencrvs.org/license. # -# Copyright (C) The OpenCRVS Authors. OpenCRVS and the OpenCRVS -# graphic logo are (registered/a) trademark(s) of Plan International. +# Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS. version: '3.3' services: diff --git a/infrastructure/docker-compose.qa-deploy.yml b/infrastructure/docker-compose.qa-deploy.yml index 9e3d7226f..36c12b500 100644 --- a/infrastructure/docker-compose.qa-deploy.yml +++ b/infrastructure/docker-compose.qa-deploy.yml @@ -5,8 +5,7 @@ # OpenCRVS is also distributed under the terms of the Civil Registration # & Healthcare Disclaimer located at http://opencrvs.org/license. # -# Copyright (C) The OpenCRVS Authors. OpenCRVS and the OpenCRVS -# graphic logo are (registered/a) trademark(s) of Plan International. +# Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS. version: '3.3' services: diff --git a/infrastructure/docker-compose.replicas-3.yml b/infrastructure/docker-compose.replicas-3.yml index 477e8e49c..2dfab769b 100644 --- a/infrastructure/docker-compose.replicas-3.yml +++ b/infrastructure/docker-compose.replicas-3.yml @@ -5,8 +5,7 @@ # OpenCRVS is also distributed under the terms of the Civil Registration # & Healthcare Disclaimer located at http://opencrvs.org/license. # -# Copyright (C) The OpenCRVS Authors. OpenCRVS and the OpenCRVS -# graphic logo are (registered/a) trademark(s) of Plan International. +# Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS. version: '3.3' services: diff --git a/infrastructure/docker-compose.replicas-5.yml b/infrastructure/docker-compose.replicas-5.yml index 130dda27b..972b173ca 100644 --- a/infrastructure/docker-compose.replicas-5.yml +++ b/infrastructure/docker-compose.replicas-5.yml @@ -5,8 +5,7 @@ # OpenCRVS is also distributed under the terms of the Civil Registration # & Healthcare Disclaimer located at http://opencrvs.org/license. # -# Copyright (C) The OpenCRVS Authors. OpenCRVS and the OpenCRVS -# graphic logo are (registered/a) trademark(s) of Plan International. +# Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS. version: '3.3' services: diff --git a/infrastructure/docker-compose.staging-deploy.yml b/infrastructure/docker-compose.staging-deploy.yml index 9e3d7226f..36c12b500 100644 --- a/infrastructure/docker-compose.staging-deploy.yml +++ b/infrastructure/docker-compose.staging-deploy.yml @@ -5,8 +5,7 @@ # OpenCRVS is also distributed under the terms of the Civil Registration # & Healthcare Disclaimer located at http://opencrvs.org/license. # -# Copyright (C) The OpenCRVS Authors. OpenCRVS and the OpenCRVS -# graphic logo are (registered/a) trademark(s) of Plan International. +# Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS. version: '3.3' services: diff --git a/infrastructure/elasticsearch/setup-helpers.sh b/infrastructure/elasticsearch/setup-helpers.sh index 7ae76a2dd..c6a25e874 100755 --- a/infrastructure/elasticsearch/setup-helpers.sh +++ b/infrastructure/elasticsearch/setup-helpers.sh @@ -7,8 +7,7 @@ # OpenCRVS is also distributed under the terms of the Civil Registration # & Healthcare Disclaimer located at http://opencrvs.org/license. # -# Copyright (C) The OpenCRVS Authors. OpenCRVS and the OpenCRVS -# graphic logo are (registered/a) trademark(s) of Plan International. +# Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS. # Log a message. function log { diff --git a/infrastructure/elasticsearch/setup-settings.sh b/infrastructure/elasticsearch/setup-settings.sh index c036a6369..eea61f90a 100644 --- a/infrastructure/elasticsearch/setup-settings.sh +++ b/infrastructure/elasticsearch/setup-settings.sh @@ -7,8 +7,7 @@ # OpenCRVS is also distributed under the terms of the Civil Registration # & Healthcare Disclaimer located at http://opencrvs.org/license. # -# Copyright (C) The OpenCRVS Authors. OpenCRVS and the OpenCRVS -# graphic logo are (registered/a) trademark(s) of Plan International. +# Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS. set -eu set -o pipefail diff --git a/infrastructure/elasticsearch/setup-users.sh b/infrastructure/elasticsearch/setup-users.sh index 41dcc1b70..366090da1 100755 --- a/infrastructure/elasticsearch/setup-users.sh +++ b/infrastructure/elasticsearch/setup-users.sh @@ -7,8 +7,7 @@ # OpenCRVS is also distributed under the terms of the Civil Registration # & Healthcare Disclaimer located at http://opencrvs.org/license. # -# Copyright (C) The OpenCRVS Authors. OpenCRVS and the OpenCRVS -# graphic logo are (registered/a) trademark(s) of Plan International. +# Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS. set -eu set -o pipefail diff --git a/infrastructure/elasticsearch/setup.sh b/infrastructure/elasticsearch/setup.sh index d7f5f22de..766132622 100755 --- a/infrastructure/elasticsearch/setup.sh +++ b/infrastructure/elasticsearch/setup.sh @@ -7,8 +7,7 @@ # OpenCRVS is also distributed under the terms of the Civil Registration # & Healthcare Disclaimer located at http://opencrvs.org/license. # -# Copyright (C) The OpenCRVS Authors. OpenCRVS and the OpenCRVS -# graphic logo are (registered/a) trademark(s) of Plan International. +# Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS. set -eu set -o pipefail diff --git a/infrastructure/emergency-backup-metadata.sh b/infrastructure/emergency-backup-metadata.sh index 40945b5be..2c3a3b651 100755 --- a/infrastructure/emergency-backup-metadata.sh +++ b/infrastructure/emergency-backup-metadata.sh @@ -5,8 +5,7 @@ # OpenCRVS is also distributed under the terms of the Civil Registration # & Healthcare Disclaimer located at http://opencrvs.org/license. # -# Copyright (C) The OpenCRVS Authors. OpenCRVS and the OpenCRVS -# graphic logo are (registered/a) trademark(s) of Plan International. +# Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS. #------------------------------------------------------------------------------------------------------------------ # By default OpenCRVS saves a backup of all data on a cron job every day in case of an emergency data loss incident diff --git a/infrastructure/emergency-restore-metadata.sh b/infrastructure/emergency-restore-metadata.sh index d6da76100..95b3adb94 100755 --- a/infrastructure/emergency-restore-metadata.sh +++ b/infrastructure/emergency-restore-metadata.sh @@ -5,8 +5,7 @@ # OpenCRVS is also distributed under the terms of the Civil Registration # & Healthcare Disclaimer located at http://opencrvs.org/license. # -# Copyright (C) The OpenCRVS Authors. OpenCRVS and the OpenCRVS -# graphic logo are (registered/a) trademark(s) of Plan International. +# Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS. #------------------------------------------------------------------------------------------------------------------ # By default OpenCRVS saves a backup of all data on a cron job every day in case of an emergency data loss incident diff --git a/infrastructure/hearth-plugins/checkDuplicateTask.js b/infrastructure/hearth-plugins/checkDuplicateTask.js index 327e5f194..a0db9c3fc 100644 --- a/infrastructure/hearth-plugins/checkDuplicateTask.js +++ b/infrastructure/hearth-plugins/checkDuplicateTask.js @@ -6,8 +6,7 @@ * OpenCRVS is also distributed under the terms of the Civil Registration * & Healthcare Disclaimer located at http://opencrvs.org/license. * - * Copyright (C) The OpenCRVS Authors. OpenCRVS and the OpenCRVS - * graphic logo are (registered/a) trademark(s) of Plan International. + * Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS. */ // @ts-check 'use strict' diff --git a/infrastructure/influxdb.conf b/infrastructure/influxdb.conf index e6c5af123..abc94177d 100644 --- a/infrastructure/influxdb.conf +++ b/infrastructure/influxdb.conf @@ -5,8 +5,7 @@ # OpenCRVS is also distributed under the terms of the Civil Registration # & Healthcare Disclaimer located at http://opencrvs.org/license. # -# Copyright (C) The OpenCRVS Authors. OpenCRVS and the OpenCRVS -# graphic logo are (registered/a) trademark(s) of Plan International. +# Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS. [meta] dir = "/var/lib/influxdb/meta" diff --git a/infrastructure/logrotate.conf b/infrastructure/logrotate.conf index 834bc5513..b70cf46c6 100644 --- a/infrastructure/logrotate.conf +++ b/infrastructure/logrotate.conf @@ -5,8 +5,7 @@ # OpenCRVS is also distributed under the terms of the Civil Registration # & Healthcare Disclaimer located at http://opencrvs.org/license. # -# Copyright (C) The OpenCRVS Authors. OpenCRVS and the OpenCRVS -# graphic logo are (registered/a) trademark(s) of Plan International. +# Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS. # see "man logrotate" for details # rotate log files weekly diff --git a/infrastructure/mongodb/on-deploy.sh b/infrastructure/mongodb/on-deploy.sh index 212ae63d9..6afb51344 100755 --- a/infrastructure/mongodb/on-deploy.sh +++ b/infrastructure/mongodb/on-deploy.sh @@ -6,8 +6,7 @@ # OpenCRVS is also distributed under the terms of the Civil Registration # & Healthcare Disclaimer located at http://opencrvs.org/license. # -# Copyright (C) The OpenCRVS Authors. OpenCRVS and the OpenCRVS -# graphic logo are (registered/a) trademark(s) of Plan International. +# Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS. # This file is run on each deployment with the sole purpose of updating # passwords of MongoDB users to passwords given to this service as environment varibles diff --git a/infrastructure/monitoring/apm/apm-server.yml b/infrastructure/monitoring/apm/apm-server.yml index c6eeed05e..1205566e9 100644 --- a/infrastructure/monitoring/apm/apm-server.yml +++ b/infrastructure/monitoring/apm/apm-server.yml @@ -5,8 +5,7 @@ # OpenCRVS is also distributed under the terms of the Civil Registration # & Healthcare Disclaimer located at http://opencrvs.org/license. # -# Copyright (C) The OpenCRVS Authors. OpenCRVS and the OpenCRVS -# graphic logo are (registered/a) trademark(s) of Plan International. +# Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS. # For more configuration options see the configuration guide for Kibana in # https://www.elastic.co/guide/index.html ######################### APM Server Configuration ######################### diff --git a/infrastructure/monitoring/beats/metricbeat.yml b/infrastructure/monitoring/beats/metricbeat.yml index 51b36d99b..cb4875457 100644 --- a/infrastructure/monitoring/beats/metricbeat.yml +++ b/infrastructure/monitoring/beats/metricbeat.yml @@ -5,8 +5,7 @@ # OpenCRVS is also distributed under the terms of the Civil Registration # & Healthcare Disclaimer located at http://opencrvs.org/license. # -# Copyright (C) The OpenCRVS Authors. OpenCRVS and the OpenCRVS -# graphic logo are (registered/a) trademark(s) of Plan International. +# Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS. --- #-------------------------------- Autodiscovery ------------------------------- # Autodiscover allows you to detect changes in the system and spawn new modules as they happen. diff --git a/infrastructure/monitoring/elastalert/auth.yaml b/infrastructure/monitoring/elastalert/auth.yaml index 7bc378e21..53b064104 100644 --- a/infrastructure/monitoring/elastalert/auth.yaml +++ b/infrastructure/monitoring/elastalert/auth.yaml @@ -5,7 +5,6 @@ # OpenCRVS is also distributed under the terms of the Civil Registration # & Healthcare Disclaimer located at http://opencrvs.org/license. # -# Copyright (C) The OpenCRVS Authors. OpenCRVS and the OpenCRVS -# graphic logo are (registered/a) trademark(s) of Plan International. +# Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS. user: '{{SMTP_USERNAME}}' password: '{{SMTP_PASSWORD}}' diff --git a/infrastructure/monitoring/elastalert/elastalert.yaml b/infrastructure/monitoring/elastalert/elastalert.yaml index f34276cb5..b74db9981 100644 --- a/infrastructure/monitoring/elastalert/elastalert.yaml +++ b/infrastructure/monitoring/elastalert/elastalert.yaml @@ -5,8 +5,7 @@ # OpenCRVS is also distributed under the terms of the Civil Registration # & Healthcare Disclaimer located at http://opencrvs.org/license. # -# Copyright (C) The OpenCRVS Authors. OpenCRVS and the OpenCRVS -# graphic logo are (registered/a) trademark(s) of Plan International. +# Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS. rules_folder: /opt/elastalert/rules run_every: diff --git a/infrastructure/monitoring/elastalert/rules/alert.yaml b/infrastructure/monitoring/elastalert/rules/alert.yaml index 42a656e29..67e9242bf 100644 --- a/infrastructure/monitoring/elastalert/rules/alert.yaml +++ b/infrastructure/monitoring/elastalert/rules/alert.yaml @@ -5,8 +5,7 @@ # OpenCRVS is also distributed under the terms of the Civil Registration # & Healthcare Disclaimer located at http://opencrvs.org/license. # -# Copyright (C) The OpenCRVS Authors. OpenCRVS and the OpenCRVS -# graphic logo are (registered/a) trademark(s) of Plan International. +# Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS. name: 'alert' type: 'frequency' index: 'kibana-alert-history-default' diff --git a/infrastructure/monitoring/elastalert/rules/service-error.yaml b/infrastructure/monitoring/elastalert/rules/service-error.yaml index 069840589..0ca54e0eb 100644 --- a/infrastructure/monitoring/elastalert/rules/service-error.yaml +++ b/infrastructure/monitoring/elastalert/rules/service-error.yaml @@ -5,8 +5,7 @@ # OpenCRVS is also distributed under the terms of the Civil Registration # & Healthcare Disclaimer located at http://opencrvs.org/license. # -# Copyright (C) The OpenCRVS Authors. OpenCRVS and the OpenCRVS -# graphic logo are (registered/a) trademark(s) of Plan International. +# Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS. name: 'service alert' type: 'frequency' index: 'kibana-alert-history-services' diff --git a/infrastructure/monitoring/kibana/kibana.yml b/infrastructure/monitoring/kibana/kibana.yml index 10c206c6f..90404ecab 100644 --- a/infrastructure/monitoring/kibana/kibana.yml +++ b/infrastructure/monitoring/kibana/kibana.yml @@ -5,8 +5,7 @@ # OpenCRVS is also distributed under the terms of the Civil Registration # & Healthcare Disclaimer located at http://opencrvs.org/license. # -# Copyright (C) The OpenCRVS Authors. OpenCRVS and the OpenCRVS -# graphic logo are (registered/a) trademark(s) of Plan International. +# Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS. # For more configuration options see the configuration guide for Kibana in # https://www.elastic.co/guide/index.html diff --git a/infrastructure/monitoring/logstash/logstash.yml b/infrastructure/monitoring/logstash/logstash.yml index 0e53e19a0..cd0840049 100644 --- a/infrastructure/monitoring/logstash/logstash.yml +++ b/infrastructure/monitoring/logstash/logstash.yml @@ -5,8 +5,7 @@ # OpenCRVS is also distributed under the terms of the Civil Registration # & Healthcare Disclaimer located at http://opencrvs.org/license. # -# Copyright (C) The OpenCRVS Authors. OpenCRVS and the OpenCRVS -# graphic logo are (registered/a) trademark(s) of Plan International. +# Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS. xpack.monitoring: enabled: true diff --git a/infrastructure/rotate-secrets.sh b/infrastructure/rotate-secrets.sh index 1b2afa16b..c2ab3cd55 100755 --- a/infrastructure/rotate-secrets.sh +++ b/infrastructure/rotate-secrets.sh @@ -5,8 +5,7 @@ # OpenCRVS is also distributed under the terms of the Civil Registration # & Healthcare Disclaimer located at http://opencrvs.org/license. # -# Copyright (C) The OpenCRVS Authors. OpenCRVS and the OpenCRVS -# graphic logo are (registered/a) trademark(s) of Plan International. +# Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS. set -e echo echo "Rotating secrets - `date --iso-8601=ns`" diff --git a/infrastructure/run-migrations.sh b/infrastructure/run-migrations.sh index eb0d70332..2c20a3759 100755 --- a/infrastructure/run-migrations.sh +++ b/infrastructure/run-migrations.sh @@ -5,8 +5,7 @@ # OpenCRVS is also distributed under the terms of the Civil Registration # & Healthcare Disclaimer located at http://opencrvs.org/license. # -# Copyright (C) The OpenCRVS Authors. OpenCRVS and the OpenCRVS -# graphic logo are (registered/a) trademark(s) of Plan International. +# Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS. set -e print_usage_and_exit () { diff --git a/infrastructure/server-setup/example-1.ini b/infrastructure/server-setup/example-1.ini index b51eb7fee..3f2777aa1 100644 --- a/infrastructure/server-setup/example-1.ini +++ b/infrastructure/server-setup/example-1.ini @@ -5,8 +5,7 @@ ; OpenCRVS is also distributed under the terms of the Civil Registration ; & Healthcare Disclaimer located at http://opencrvs.org/license. ; -; Copyright (C) The OpenCRVS Authors. OpenCRVS and the OpenCRVS -; graphic logo are (registered/a) trademark(s) of Plan International. +; Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS. [docker-manager-first] ; Uncomment the line below ; manager1 ansible_host="ENTER YOUR MANAGER HOST IP" diff --git a/infrastructure/server-setup/example-3.ini b/infrastructure/server-setup/example-3.ini index c7f849680..abee8efe2 100644 --- a/infrastructure/server-setup/example-3.ini +++ b/infrastructure/server-setup/example-3.ini @@ -5,8 +5,7 @@ ; OpenCRVS is also distributed under the terms of the Civil Registration ; & Healthcare Disclaimer located at http://opencrvs.org/license. ; -; Copyright (C) The OpenCRVS Authors. OpenCRVS and the OpenCRVS -; graphic logo are (registered/a) trademark(s) of Plan International. +; Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS. [docker-manager-first] ; Uncomment the line below ; manager1 ansible_host="ENTER YOUR MANAGER HOST IP" diff --git a/infrastructure/server-setup/example-5.ini b/infrastructure/server-setup/example-5.ini index 9882786a8..f1fed1688 100644 --- a/infrastructure/server-setup/example-5.ini +++ b/infrastructure/server-setup/example-5.ini @@ -5,8 +5,7 @@ ; OpenCRVS is also distributed under the terms of the Civil Registration ; & Healthcare Disclaimer located at http://opencrvs.org/license. ; -; Copyright (C) The OpenCRVS Authors. OpenCRVS and the OpenCRVS -; graphic logo are (registered/a) trademark(s) of Plan International. +; Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS. [docker-manager-first] ; Uncomment the line below ; manager1 ansible_host="ENTER YOUR MANAGER HOST IP" diff --git a/infrastructure/server-setup/group_vars/all.yml b/infrastructure/server-setup/group_vars/all.yml index 5c46b129c..6ccfbda44 100644 --- a/infrastructure/server-setup/group_vars/all.yml +++ b/infrastructure/server-setup/group_vars/all.yml @@ -5,8 +5,7 @@ # OpenCRVS is also distributed under the terms of the Civil Registration # & Healthcare Disclaimer located at http://opencrvs.org/license. # -# Copyright (C) The OpenCRVS Authors. OpenCRVS and the OpenCRVS -# graphic logo are (registered/a) trademark(s) of Plan International. +# Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS. ansible_python_interpreter: /usr/bin/python3 ansible_user: root encrypt_data: False diff --git a/infrastructure/server-setup/playbook-1.yml b/infrastructure/server-setup/playbook-1.yml index e0e162a30..2ed307378 100644 --- a/infrastructure/server-setup/playbook-1.yml +++ b/infrastructure/server-setup/playbook-1.yml @@ -5,8 +5,7 @@ # OpenCRVS is also distributed under the terms of the Civil Registration # & Healthcare Disclaimer located at http://opencrvs.org/license. # -# Copyright (C) The OpenCRVS Authors. OpenCRVS and the OpenCRVS -# graphic logo are (registered/a) trademark(s) of Plan International. +# Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS. --- - hosts: localhost tasks: diff --git a/infrastructure/server-setup/playbook-3.yml b/infrastructure/server-setup/playbook-3.yml index 2cefac779..60a1d307f 100644 --- a/infrastructure/server-setup/playbook-3.yml +++ b/infrastructure/server-setup/playbook-3.yml @@ -5,8 +5,7 @@ # OpenCRVS is also distributed under the terms of the Civil Registration # & Healthcare Disclaimer located at http://opencrvs.org/license. # -# Copyright (C) The OpenCRVS Authors. OpenCRVS and the OpenCRVS -# graphic logo are (registered/a) trademark(s) of Plan International. +# Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS. --- - hosts: localhost tasks: diff --git a/infrastructure/server-setup/playbook-5.yml b/infrastructure/server-setup/playbook-5.yml index 7fa87d20b..5308ea210 100644 --- a/infrastructure/server-setup/playbook-5.yml +++ b/infrastructure/server-setup/playbook-5.yml @@ -5,8 +5,7 @@ # OpenCRVS is also distributed under the terms of the Civil Registration # & Healthcare Disclaimer located at http://opencrvs.org/license. # -# Copyright (C) The OpenCRVS Authors. OpenCRVS and the OpenCRVS -# graphic logo are (registered/a) trademark(s) of Plan International. +# Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS. --- - hosts: localhost tasks: diff --git a/infrastructure/setup-deploy-config.sh b/infrastructure/setup-deploy-config.sh index 8cb5b4e44..7c3a3eb6f 100755 --- a/infrastructure/setup-deploy-config.sh +++ b/infrastructure/setup-deploy-config.sh @@ -5,8 +5,7 @@ # OpenCRVS is also distributed under the terms of the Civil Registration # & Healthcare Disclaimer located at http://opencrvs.org/license. # -# Copyright (C) The OpenCRVS Authors. OpenCRVS and the OpenCRVS -# graphic logo are (registered/a) trademark(s) of Plan International. +# Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS. set -e echo echo "Setting up deployment config for $1 - `date --iso-8601=ns`" diff --git a/package.json b/package.json index 22d0bf04c..08e20f96c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@opencrvs/countryconfig", - "version": "1.3.0-beta", + "version": "1.3.0", "description": "OpenCRVS country configuration for reference data", "license": "MPL-2.0", "husky": { diff --git a/src/api/application/country-logo.ts b/src/api/application/country-logo.ts index 690aa4f94..70776e005 100644 --- a/src/api/application/country-logo.ts +++ b/src/api/application/country-logo.ts @@ -6,8 +6,7 @@ * OpenCRVS is also distributed under the terms of the Civil Registration * & Healthcare Disclaimer located at http://opencrvs.org/license. * - * Copyright (C) The OpenCRVS Authors. OpenCRVS and the OpenCRVS - * graphic logo are (registered/a) trademark(s) of Plan International. + * Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS. */ export const countryLogo = { fileName: 'logo.png', diff --git a/src/api/application/handler.ts b/src/api/application/handler.ts index 96b8ee4f7..68e655f47 100644 --- a/src/api/application/handler.ts +++ b/src/api/application/handler.ts @@ -6,8 +6,7 @@ * OpenCRVS is also distributed under the terms of the Civil Registration * & Healthcare Disclaimer located at http://opencrvs.org/license. * - * Copyright (C) The OpenCRVS Authors. OpenCRVS and the OpenCRVS - * graphic logo are (registered/a) trademark(s) of Plan International. + * Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS. */ import { Request, ResponseToolkit } from '@hapi/hapi' diff --git a/src/api/content/handler.test.ts b/src/api/content/handler.test.ts index 5bdc46a12..9b2a912aa 100644 --- a/src/api/content/handler.test.ts +++ b/src/api/content/handler.test.ts @@ -6,8 +6,7 @@ * OpenCRVS is also distributed under the terms of the Civil Registration * & Healthcare Disclaimer located at http://opencrvs.org/license. * - * Copyright (C) The OpenCRVS Authors. OpenCRVS and the OpenCRVS - * graphic logo are (registered/a) trademark(s) of Plan International. + * Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS. */ import { readFileSync } from 'fs' import * as jwt from 'jsonwebtoken' diff --git a/src/api/content/handler.ts b/src/api/content/handler.ts index 06c3b0736..fe526216d 100644 --- a/src/api/content/handler.ts +++ b/src/api/content/handler.ts @@ -6,8 +6,7 @@ * OpenCRVS is also distributed under the terms of the Civil Registration * & Healthcare Disclaimer located at http://opencrvs.org/license. * - * Copyright (C) The OpenCRVS Authors. OpenCRVS and the OpenCRVS - * graphic logo are (registered/a) trademark(s) of Plan International. + * Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS. */ import * as Hapi from '@hapi/hapi' import { getLanguages, ILanguage } from '@countryconfig/api/content/service' diff --git a/src/api/content/service.ts b/src/api/content/service.ts index 7e54a4a96..4156cad43 100644 --- a/src/api/content/service.ts +++ b/src/api/content/service.ts @@ -6,8 +6,7 @@ * OpenCRVS is also distributed under the terms of the Civil Registration * & Healthcare Disclaimer located at http://opencrvs.org/license. * - * Copyright (C) The OpenCRVS Authors. OpenCRVS and the OpenCRVS - * graphic logo are (registered/a) trademark(s) of Plan International. + * Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS. */ import { readFile } from 'fs' import { join } from 'path' diff --git a/src/api/dashboard-map/handler.ts b/src/api/dashboard-map/handler.ts index 942051f70..946c9f678 100644 --- a/src/api/dashboard-map/handler.ts +++ b/src/api/dashboard-map/handler.ts @@ -6,8 +6,7 @@ * OpenCRVS is also distributed under the terms of the Civil Registration * & Healthcare Disclaimer located at http://opencrvs.org/license. * - * Copyright (C) The OpenCRVS Authors. OpenCRVS and the OpenCRVS - * graphic logo are (registered/a) trademark(s) of Plan International. + * Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS. */ import * as Hapi from '@hapi/hapi' import * as fs from 'fs' diff --git a/src/api/data-generator/handler.ts b/src/api/data-generator/handler.ts index e9b1546fe..9265a8e79 100644 --- a/src/api/data-generator/handler.ts +++ b/src/api/data-generator/handler.ts @@ -6,8 +6,7 @@ * OpenCRVS is also distributed under the terms of the Civil Registration * & Healthcare Disclaimer located at http://opencrvs.org/license. * - * Copyright (C) The OpenCRVS Authors. OpenCRVS and the OpenCRVS - * graphic logo are (registered/a) trademark(s) of Plan International. + * Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS. */ import * as Hapi from '@hapi/hapi' import { getStatistics } from '@countryconfig/api/data-generator/service' diff --git a/src/api/data-generator/service.ts b/src/api/data-generator/service.ts index 5ed8fa8f8..3a6099f90 100644 --- a/src/api/data-generator/service.ts +++ b/src/api/data-generator/service.ts @@ -6,8 +6,7 @@ * OpenCRVS is also distributed under the terms of the Civil Registration * & Healthcare Disclaimer located at http://opencrvs.org/license. * - * Copyright (C) The OpenCRVS Authors. OpenCRVS and the OpenCRVS - * graphic logo are (registered/a) trademark(s) of Plan International. + * Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS. */ import { FHIR_URL } from '@countryconfig/constants' import fetch from 'node-fetch' diff --git a/src/api/event-registration/handler.ts b/src/api/event-registration/handler.ts index f5d5ccc24..28a273cf3 100644 --- a/src/api/event-registration/handler.ts +++ b/src/api/event-registration/handler.ts @@ -6,8 +6,7 @@ * OpenCRVS is also distributed under the terms of the Civil Registration * & Healthcare Disclaimer located at http://opencrvs.org/license. * - * Copyright (C) The OpenCRVS Authors. OpenCRVS and the OpenCRVS - * graphic logo are (registered/a) trademark(s) of Plan International. + * Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS. */ import * as Hapi from '@hapi/hapi' import fetch from 'node-fetch' diff --git a/src/api/event-registration/service.ts b/src/api/event-registration/service.ts index 1c5c65607..03c5b4ed2 100644 --- a/src/api/event-registration/service.ts +++ b/src/api/event-registration/service.ts @@ -6,8 +6,7 @@ * OpenCRVS is also distributed under the terms of the Civil Registration * & Healthcare Disclaimer located at http://opencrvs.org/license. * - * Copyright (C) The OpenCRVS Authors. OpenCRVS and the OpenCRVS - * graphic logo are (registered/a) trademark(s) of Plan International. + * Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS. */ import { getTaskResource, diff --git a/src/api/mediators/mosip-openhim-mediator/handler.ts b/src/api/mediators/mosip-openhim-mediator/handler.ts index c9812a20b..162f0bb63 100644 --- a/src/api/mediators/mosip-openhim-mediator/handler.ts +++ b/src/api/mediators/mosip-openhim-mediator/handler.ts @@ -6,8 +6,7 @@ * OpenCRVS is also distributed under the terms of the Civil Registration * & Healthcare Disclaimer located at http://opencrvs.org/license. * - * Copyright (C) The OpenCRVS Authors. OpenCRVS and the OpenCRVS - * graphic logo are (registered/a) trademark(s) of Plan International. + * Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS. */ import { OPENCRVS_SPECIFICATION_URL, diff --git a/src/api/notification/email-service.ts b/src/api/notification/email-service.ts index eb6f7be20..4b72c447e 100644 --- a/src/api/notification/email-service.ts +++ b/src/api/notification/email-service.ts @@ -6,8 +6,7 @@ * OpenCRVS is also distributed under the terms of the Civil Registration * & Healthcare Disclaimer located at http://opencrvs.org/license. * - * Copyright (C) The OpenCRVS Authors. OpenCRVS and the OpenCRVS - * graphic logo are (registered/a) trademark(s) of Plan International. + * Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS. */ import * as fs from 'fs' diff --git a/src/api/notification/handler.ts b/src/api/notification/handler.ts index 98adfccba..92ce970ce 100644 --- a/src/api/notification/handler.ts +++ b/src/api/notification/handler.ts @@ -6,8 +6,7 @@ * OpenCRVS is also distributed under the terms of the Civil Registration * & Healthcare Disclaimer located at http://opencrvs.org/license. * - * Copyright (C) The OpenCRVS Authors. OpenCRVS and the OpenCRVS - * graphic logo are (registered/a) trademark(s) of Plan International. + * Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS. */ import * as Hapi from '@hapi/hapi' import * as Joi from 'joi' diff --git a/src/api/notification/sms-service.ts b/src/api/notification/sms-service.ts index b16e33eb1..5a613f04f 100644 --- a/src/api/notification/sms-service.ts +++ b/src/api/notification/sms-service.ts @@ -6,8 +6,7 @@ * OpenCRVS is also distributed under the terms of the Civil Registration * & Healthcare Disclaimer located at http://opencrvs.org/license. * - * Copyright (C) The OpenCRVS Authors. OpenCRVS and the OpenCRVS - * graphic logo are (registered/a) trademark(s) of Plan International. + * Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS. */ import { INFOBIP_API_KEY, diff --git a/src/client-config.js b/src/client-config.js index 43a291b79..da7418804 100644 --- a/src/client-config.js +++ b/src/client-config.js @@ -6,8 +6,7 @@ * OpenCRVS is also distributed under the terms of the Civil Registration * & Healthcare Disclaimer located at http://opencrvs.org/license. * - * Copyright (C) The OpenCRVS Authors. OpenCRVS and the OpenCRVS - * graphic logo are (registered/a) trademark(s) of Plan International. + * Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS. */ window.config = { API_GATEWAY_URL: 'http://localhost:7070/', diff --git a/src/client-config.prod.js b/src/client-config.prod.js index e9910e7fe..f5067b734 100644 --- a/src/client-config.prod.js +++ b/src/client-config.prod.js @@ -6,8 +6,7 @@ * OpenCRVS is also distributed under the terms of the Civil Registration * & Healthcare Disclaimer located at http://opencrvs.org/license. * - * Copyright (C) The OpenCRVS Authors. OpenCRVS and the OpenCRVS - * graphic logo are (registered/a) trademark(s) of Plan International. + * Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS. */ window.config = { API_GATEWAY_URL: 'https://gateway.{{hostname}}/', diff --git a/src/constants.ts b/src/constants.ts index f0e72ac5e..aca9a68c1 100644 --- a/src/constants.ts +++ b/src/constants.ts @@ -6,8 +6,7 @@ * OpenCRVS is also distributed under the terms of the Civil Registration * & Healthcare Disclaimer located at http://opencrvs.org/license. * - * Copyright (C) The OpenCRVS Authors. OpenCRVS and the OpenCRVS - * graphic logo are (registered/a) trademark(s) of Plan International. + * Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS. */ export const TEST_SOURCE = `${process.cwd()}/src/tests/` export const HOSTNAME = process.env.HOSTNAME || '*' diff --git a/src/data-generator/birthNotification.ts b/src/data-generator/birthNotification.ts index 4854ac661..7677c50fe 100644 --- a/src/data-generator/birthNotification.ts +++ b/src/data-generator/birthNotification.ts @@ -6,8 +6,7 @@ * OpenCRVS is also distributed under the terms of the Civil Registration * & Healthcare Disclaimer located at http://opencrvs.org/license. * - * Copyright (C) The OpenCRVS Authors. OpenCRVS and the OpenCRVS - * graphic logo are (registered/a) trademark(s) of Plan International. + * Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS. */ interface BirthNotification { child: { diff --git a/src/data-generator/options.ts b/src/data-generator/options.ts index 2e674b139..ab7c4d6a2 100644 --- a/src/data-generator/options.ts +++ b/src/data-generator/options.ts @@ -6,8 +6,7 @@ * OpenCRVS is also distributed under the terms of the Civil Registration * & Healthcare Disclaimer located at http://opencrvs.org/license. * - * Copyright (C) The OpenCRVS Authors. OpenCRVS and the OpenCRVS - * graphic logo are (registered/a) trademark(s) of Plan International. + * Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS. */ // A file just to store the constants used in data-generator diff --git a/src/data-seeding/certificates/handler.ts b/src/data-seeding/certificates/handler.ts index 89d854f74..ede4b901d 100644 --- a/src/data-seeding/certificates/handler.ts +++ b/src/data-seeding/certificates/handler.ts @@ -6,8 +6,7 @@ * OpenCRVS is also distributed under the terms of the Civil Registration * & Healthcare Disclaimer located at http://opencrvs.org/license. * - * Copyright (C) The OpenCRVS Authors. OpenCRVS and the OpenCRVS - * graphic logo are (registered/a) trademark(s) of Plan International. + * Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS. */ import { Request, ResponseToolkit } from '@hapi/hapi' diff --git a/src/data-seeding/employees/handler.ts b/src/data-seeding/employees/handler.ts index 46998b2a7..59aee343b 100644 --- a/src/data-seeding/employees/handler.ts +++ b/src/data-seeding/employees/handler.ts @@ -6,8 +6,7 @@ * OpenCRVS is also distributed under the terms of the Civil Registration * & Healthcare Disclaimer located at http://opencrvs.org/license. * - * Copyright (C) The OpenCRVS Authors. OpenCRVS and the OpenCRVS - * graphic logo are (registered/a) trademark(s) of Plan International. + * Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS. */ import { readCSVToJSON } from '@countryconfig/utils' import { Request, ResponseToolkit } from '@hapi/hapi' diff --git a/src/data-seeding/locations/handler.ts b/src/data-seeding/locations/handler.ts index 649527819..a1ef5a71b 100644 --- a/src/data-seeding/locations/handler.ts +++ b/src/data-seeding/locations/handler.ts @@ -6,8 +6,7 @@ * OpenCRVS is also distributed under the terms of the Civil Registration * & Healthcare Disclaimer located at http://opencrvs.org/license. * - * Copyright (C) The OpenCRVS Authors. OpenCRVS and the OpenCRVS - * graphic logo are (registered/a) trademark(s) of Plan International. + * Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS. */ import { readCSVToJSON, diff --git a/src/data-seeding/roles/handler.ts b/src/data-seeding/roles/handler.ts index ff05f1f3d..4a611c563 100644 --- a/src/data-seeding/roles/handler.ts +++ b/src/data-seeding/roles/handler.ts @@ -6,8 +6,7 @@ * OpenCRVS is also distributed under the terms of the Civil Registration * & Healthcare Disclaimer located at http://opencrvs.org/license. * - * Copyright (C) The OpenCRVS Authors. OpenCRVS and the OpenCRVS - * graphic logo are (registered/a) trademark(s) of Plan International. + * Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS. */ import { readCSVToJSON } from '@countryconfig/utils' import { Request, ResponseToolkit } from '@hapi/hapi' diff --git a/src/data-seeding/roles/validator.ts b/src/data-seeding/roles/validator.ts index b5b222477..02c2d9c01 100644 --- a/src/data-seeding/roles/validator.ts +++ b/src/data-seeding/roles/validator.ts @@ -6,8 +6,7 @@ * OpenCRVS is also distributed under the terms of the Civil Registration * & Healthcare Disclaimer located at http://opencrvs.org/license. * - * Copyright (C) The OpenCRVS Authors. OpenCRVS and the OpenCRVS - * graphic logo are (registered/a) trademark(s) of Plan International. + * Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS. */ import { TypeOf, z } from 'zod' diff --git a/src/form/addresses/index.ts b/src/form/addresses/index.ts index d8f917cc4..01c6a17cc 100644 --- a/src/form/addresses/index.ts +++ b/src/form/addresses/index.ts @@ -6,8 +6,7 @@ * OpenCRVS is also distributed under the terms of the Civil Registration * & Healthcare Disclaimer located at http://opencrvs.org/license. * - * Copyright (C) The OpenCRVS Authors. OpenCRVS and the OpenCRVS - * graphic logo are (registered/a) trademark(s) of Plan International. + * Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS. */ import { diff --git a/src/form/birth/certificate-handlebars.ts b/src/form/birth/certificate-handlebars.ts index bf5d4e7ef..f2ad26458 100644 --- a/src/form/birth/certificate-handlebars.ts +++ b/src/form/birth/certificate-handlebars.ts @@ -6,8 +6,7 @@ * OpenCRVS is also distributed under the terms of the Civil Registration * & Healthcare Disclaimer located at http://opencrvs.org/license. * - * Copyright (C) The OpenCRVS Authors. OpenCRVS and the OpenCRVS - * graphic logo are (registered/a) trademark(s) of Plan International. + * Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS. */ // THE FOLLOWING HANDLEBARS CAN BE USED IN THE SVG CODE IN THE CERTIFICATE FOR THIS EVENT diff --git a/src/form/birth/index.ts b/src/form/birth/index.ts index aa8092738..63b2d554b 100644 --- a/src/form/birth/index.ts +++ b/src/form/birth/index.ts @@ -6,8 +6,7 @@ * OpenCRVS is also distributed under the terms of the Civil Registration * & Healthcare Disclaimer located at http://opencrvs.org/license. * - * Copyright (C) The OpenCRVS Authors. OpenCRVS and the OpenCRVS - * graphic logo are (registered/a) trademark(s) of Plan International. + * Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS. */ import { Event, ISerializedForm } from '../types/types' diff --git a/src/form/birth/optional-fields.ts b/src/form/birth/optional-fields.ts index 22173f452..dddd1a421 100644 --- a/src/form/birth/optional-fields.ts +++ b/src/form/birth/optional-fields.ts @@ -6,8 +6,7 @@ * OpenCRVS is also distributed under the terms of the Civil Registration * & Healthcare Disclaimer located at http://opencrvs.org/license. * - * Copyright (C) The OpenCRVS Authors. OpenCRVS and the OpenCRVS - * graphic logo are (registered/a) trademark(s) of Plan International. + * Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS. */ import { getFieldMapping } from '@countryconfig/utils/mapping/field-mapping-utils' import { formMessageDescriptors } from '../common/messages' diff --git a/src/form/birth/required-fields.ts b/src/form/birth/required-fields.ts index e8d3a23ee..5d776ee29 100644 --- a/src/form/birth/required-fields.ts +++ b/src/form/birth/required-fields.ts @@ -6,8 +6,7 @@ * OpenCRVS is also distributed under the terms of the Civil Registration * & Healthcare Disclaimer located at http://opencrvs.org/license. * - * Copyright (C) The OpenCRVS Authors. OpenCRVS and the OpenCRVS - * graphic logo are (registered/a) trademark(s) of Plan International. + * Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS. */ import { MessageDescriptor } from 'react-intl' diff --git a/src/form/common/common-optional-fields.ts b/src/form/common/common-optional-fields.ts index 652a071b1..ac02b523b 100644 --- a/src/form/common/common-optional-fields.ts +++ b/src/form/common/common-optional-fields.ts @@ -6,8 +6,7 @@ * OpenCRVS is also distributed under the terms of the Civil Registration * & Healthcare Disclaimer located at http://opencrvs.org/license. * - * Copyright (C) The OpenCRVS Authors. OpenCRVS and the OpenCRVS - * graphic logo are (registered/a) trademark(s) of Plan International. + * Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS. */ import { MessageDescriptor } from 'react-intl' import { formMessageDescriptors } from './messages' diff --git a/src/form/common/common-required-fields.ts b/src/form/common/common-required-fields.ts index bd439c20d..7213712fd 100644 --- a/src/form/common/common-required-fields.ts +++ b/src/form/common/common-required-fields.ts @@ -6,8 +6,7 @@ * OpenCRVS is also distributed under the terms of the Civil Registration * & Healthcare Disclaimer located at http://opencrvs.org/license. * - * Copyright (C) The OpenCRVS Authors. OpenCRVS and the OpenCRVS - * graphic logo are (registered/a) trademark(s) of Plan International. + * Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS. */ import { formMessageDescriptors } from './messages' diff --git a/src/form/common/custom-validation-conditionals/custom-validators.ts b/src/form/common/custom-validation-conditionals/custom-validators.ts index 08d2e9595..122127c7e 100644 --- a/src/form/common/custom-validation-conditionals/custom-validators.ts +++ b/src/form/common/custom-validation-conditionals/custom-validators.ts @@ -6,8 +6,7 @@ * OpenCRVS is also distributed under the terms of the Civil Registration * & Healthcare Disclaimer located at http://opencrvs.org/license. * - * Copyright (C) The OpenCRVS Authors. OpenCRVS and the OpenCRVS - * graphic logo are (registered/a) trademark(s) of Plan International. + * Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS. */ import { IFormFieldValue, ValidationResult } from '../../types/types' diff --git a/src/form/common/default-validation-conditionals.ts b/src/form/common/default-validation-conditionals.ts index b81f705d2..896e0b2da 100644 --- a/src/form/common/default-validation-conditionals.ts +++ b/src/form/common/default-validation-conditionals.ts @@ -6,8 +6,7 @@ * OpenCRVS is also distributed under the terms of the Civil Registration * & Healthcare Disclaimer located at http://opencrvs.org/license. * - * Copyright (C) The OpenCRVS Authors. OpenCRVS and the OpenCRVS - * graphic logo are (registered/a) trademark(s) of Plan International. + * Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS. */ import { Conditional } from '../types/types' import { IntegratingSystemType } from '../types/types' diff --git a/src/form/common/messages.ts b/src/form/common/messages.ts index ce991a393..9c2798f6f 100644 --- a/src/form/common/messages.ts +++ b/src/form/common/messages.ts @@ -6,8 +6,7 @@ * OpenCRVS is also distributed under the terms of the Civil Registration * & Healthcare Disclaimer located at http://opencrvs.org/license. * - * Copyright (C) The OpenCRVS Authors. OpenCRVS and the OpenCRVS - * graphic logo are (registered/a) trademark(s) of Plan International. + * Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS. */ import { MessageDescriptor } from 'react-intl' // FORMATJS MESSAGE CONSTANTS FOR MULTI-LINGUAL TRANSLATION diff --git a/src/form/common/preview-groups.ts b/src/form/common/preview-groups.ts index 99d5320a1..bad134ecc 100644 --- a/src/form/common/preview-groups.ts +++ b/src/form/common/preview-groups.ts @@ -6,8 +6,7 @@ * OpenCRVS is also distributed under the terms of the Civil Registration * & Healthcare Disclaimer located at http://opencrvs.org/license. * - * Copyright (C) The OpenCRVS Authors. OpenCRVS and the OpenCRVS - * graphic logo are (registered/a) trademark(s) of Plan International. + * Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS. */ import { formMessageDescriptors } from './messages' diff --git a/src/form/common/select-options.ts b/src/form/common/select-options.ts index cc1a432e1..c86c1696b 100644 --- a/src/form/common/select-options.ts +++ b/src/form/common/select-options.ts @@ -6,8 +6,7 @@ * OpenCRVS is also distributed under the terms of the Civil Registration * & Healthcare Disclaimer located at http://opencrvs.org/license. * - * Copyright (C) The OpenCRVS Authors. OpenCRVS and the OpenCRVS - * graphic logo are (registered/a) trademark(s) of Plan International. + * Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS. */ // A file just to store the constants until we decide what to do with removing hardcoded options from core diff --git a/src/form/custom-fields.ts b/src/form/custom-fields.ts index de0b8e06c..b6f8e6d23 100644 --- a/src/form/custom-fields.ts +++ b/src/form/custom-fields.ts @@ -6,8 +6,7 @@ * OpenCRVS is also distributed under the terms of the Civil Registration * & Healthcare Disclaimer located at http://opencrvs.org/license. * - * Copyright (C) The OpenCRVS Authors. OpenCRVS and the OpenCRVS - * graphic logo are (registered/a) trademark(s) of Plan International. + * Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS. */ import { SerializedFormField } from './types/types' diff --git a/src/form/death/certficate-handlebars.ts b/src/form/death/certficate-handlebars.ts index 052991474..dd5cf4cfb 100644 --- a/src/form/death/certficate-handlebars.ts +++ b/src/form/death/certficate-handlebars.ts @@ -6,8 +6,7 @@ * OpenCRVS is also distributed under the terms of the Civil Registration * & Healthcare Disclaimer located at http://opencrvs.org/license. * - * Copyright (C) The OpenCRVS Authors. OpenCRVS and the OpenCRVS - * graphic logo are (registered/a) trademark(s) of Plan International. + * Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS. */ // THE FOLLOWING HANDLEBARS CAN BE USED IN THE SVG CODE IN THE CERTIFICATE FOR THIS EVENT diff --git a/src/form/death/index.ts b/src/form/death/index.ts index bd26441be..8b30ea5bc 100644 --- a/src/form/death/index.ts +++ b/src/form/death/index.ts @@ -6,8 +6,7 @@ * OpenCRVS is also distributed under the terms of the Civil Registration * & Healthcare Disclaimer located at http://opencrvs.org/license. * - * Copyright (C) The OpenCRVS Authors. OpenCRVS and the OpenCRVS - * graphic logo are (registered/a) trademark(s) of Plan International. + * Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS. */ import { diff --git a/src/form/death/required-fields.ts b/src/form/death/required-fields.ts index dccaebc5e..e560144f4 100644 --- a/src/form/death/required-fields.ts +++ b/src/form/death/required-fields.ts @@ -6,8 +6,7 @@ * OpenCRVS is also distributed under the terms of the Civil Registration * & Healthcare Disclaimer located at http://opencrvs.org/license. * - * Copyright (C) The OpenCRVS Authors. OpenCRVS and the OpenCRVS - * graphic logo are (registered/a) trademark(s) of Plan International. + * Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS. */ import { getFieldMapping } from '@countryconfig/utils/mapping/field-mapping-utils' diff --git a/src/form/index.ts b/src/form/index.ts index d3c96128b..1dc89b8ab 100644 --- a/src/form/index.ts +++ b/src/form/index.ts @@ -6,8 +6,7 @@ * OpenCRVS is also distributed under the terms of the Civil Registration * & Healthcare Disclaimer located at http://opencrvs.org/license. * - * Copyright (C) The OpenCRVS Authors. OpenCRVS and the OpenCRVS - * graphic logo are (registered/a) trademark(s) of Plan International. + * Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS. */ import { decorateFormsWithAddresses } from '../utils/address-utils' diff --git a/src/form/marriage/certificate-handlebars.ts b/src/form/marriage/certificate-handlebars.ts index 0e54cee7c..09a483892 100644 --- a/src/form/marriage/certificate-handlebars.ts +++ b/src/form/marriage/certificate-handlebars.ts @@ -6,8 +6,7 @@ * OpenCRVS is also distributed under the terms of the Civil Registration * & Healthcare Disclaimer located at http://opencrvs.org/license. * - * Copyright (C) The OpenCRVS Authors. OpenCRVS and the OpenCRVS - * graphic logo are (registered/a) trademark(s) of Plan International. + * Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS. */ // THE FOLLOWING HANDLEBARS CAN BE USED IN THE SVG CODE IN THE CERTIFICATE FOR THIS EVENT diff --git a/src/form/marriage/index.ts b/src/form/marriage/index.ts index 833eb0974..36d1e3525 100644 --- a/src/form/marriage/index.ts +++ b/src/form/marriage/index.ts @@ -6,8 +6,7 @@ * OpenCRVS is also distributed under the terms of the Civil Registration * & Healthcare Disclaimer located at http://opencrvs.org/license. * - * Copyright (C) The OpenCRVS Authors. OpenCRVS and the OpenCRVS - * graphic logo are (registered/a) trademark(s) of Plan International. + * Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS. */ import { diff --git a/src/form/marriage/optional-fields.ts b/src/form/marriage/optional-fields.ts index 679d06713..6ea6b3f10 100644 --- a/src/form/marriage/optional-fields.ts +++ b/src/form/marriage/optional-fields.ts @@ -6,8 +6,7 @@ * OpenCRVS is also distributed under the terms of the Civil Registration * & Healthcare Disclaimer located at http://opencrvs.org/license. * - * Copyright (C) The OpenCRVS Authors. OpenCRVS and the OpenCRVS - * graphic logo are (registered/a) trademark(s) of Plan International. + * Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS. */ import { getFieldMapping } from '@countryconfig/utils/mapping/field-mapping-utils' diff --git a/src/form/marriage/required-fields.ts b/src/form/marriage/required-fields.ts index 99cfaf3bc..9f2238435 100644 --- a/src/form/marriage/required-fields.ts +++ b/src/form/marriage/required-fields.ts @@ -6,8 +6,7 @@ * OpenCRVS is also distributed under the terms of the Civil Registration * & Healthcare Disclaimer located at http://opencrvs.org/license. * - * Copyright (C) The OpenCRVS Authors. OpenCRVS and the OpenCRVS - * graphic logo are (registered/a) trademark(s) of Plan International. + * Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS. */ import { getFieldMapping } from '@countryconfig/utils/mapping/field-mapping-utils' diff --git a/src/form/types/types.ts b/src/form/types/types.ts index d9fdfc00c..ecc6351f3 100644 --- a/src/form/types/types.ts +++ b/src/form/types/types.ts @@ -6,8 +6,7 @@ * OpenCRVS is also distributed under the terms of the Civil Registration * & Healthcare Disclaimer located at http://opencrvs.org/license. * - * Copyright (C) The OpenCRVS Authors. OpenCRVS and the OpenCRVS - * graphic logo are (registered/a) trademark(s) of Plan International. + * Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS. */ import { MessageDescriptor } from 'react-intl' diff --git a/src/form/types/validators.ts b/src/form/types/validators.ts index 24bf741f8..bac46155b 100644 --- a/src/form/types/validators.ts +++ b/src/form/types/validators.ts @@ -6,8 +6,7 @@ * OpenCRVS is also distributed under the terms of the Civil Registration * & Healthcare Disclaimer located at http://opencrvs.org/license. * - * Copyright (C) The OpenCRVS Authors. OpenCRVS and the OpenCRVS - * graphic logo are (registered/a) trademark(s) of Plan International. + * Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS. */ import * as customValidators from '../common/custom-validation-conditionals/custom-validators' diff --git a/src/index.test.ts b/src/index.test.ts index c70e518b6..6ae2a800e 100644 --- a/src/index.test.ts +++ b/src/index.test.ts @@ -6,8 +6,7 @@ * OpenCRVS is also distributed under the terms of the Civil Registration * & Healthcare Disclaimer located at http://opencrvs.org/license. * - * Copyright (C) The OpenCRVS Authors. OpenCRVS and the OpenCRVS - * graphic logo are (registered/a) trademark(s) of Plan International. + * Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS. */ import { readFileSync } from 'fs' import * as jwt from 'jsonwebtoken' diff --git a/src/index.ts b/src/index.ts index 593308e70..e68e37612 100644 --- a/src/index.ts +++ b/src/index.ts @@ -6,8 +6,7 @@ * OpenCRVS is also distributed under the terms of the Civil Registration * & Healthcare Disclaimer located at http://opencrvs.org/license. * - * Copyright (C) The OpenCRVS Authors. OpenCRVS and the OpenCRVS - * graphic logo are (registered/a) trademark(s) of Plan International. + * Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS. */ require('app-module-path').addPath(require('path').join(__dirname)) diff --git a/src/logger.ts b/src/logger.ts index f051375c4..06aeb480f 100644 --- a/src/logger.ts +++ b/src/logger.ts @@ -6,8 +6,7 @@ * OpenCRVS is also distributed under the terms of the Civil Registration * & Healthcare Disclaimer located at http://opencrvs.org/license. * - * Copyright (C) The OpenCRVS Authors. OpenCRVS and the OpenCRVS - * graphic logo are (registered/a) trademark(s) of Plan International. + * Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS. */ import * as pino from 'pino' export const logger = pino() diff --git a/src/login-config.js b/src/login-config.js index 13f1fd368..cbd68912d 100644 --- a/src/login-config.js +++ b/src/login-config.js @@ -6,8 +6,7 @@ * OpenCRVS is also distributed under the terms of the Civil Registration * & Healthcare Disclaimer located at http://opencrvs.org/license. * - * Copyright (C) The OpenCRVS Authors. OpenCRVS and the OpenCRVS - * graphic logo are (registered/a) trademark(s) of Plan International. + * Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS. */ window.config = { AUTH_API_URL: 'http://localhost:4040/', diff --git a/src/login-config.prod.js b/src/login-config.prod.js index 192949951..41bd3ee56 100644 --- a/src/login-config.prod.js +++ b/src/login-config.prod.js @@ -6,8 +6,7 @@ * OpenCRVS is also distributed under the terms of the Civil Registration * & Healthcare Disclaimer located at http://opencrvs.org/license. * - * Copyright (C) The OpenCRVS Authors. OpenCRVS and the OpenCRVS - * graphic logo are (registered/a) trademark(s) of Plan International. + * Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS. */ window.config = { AUTH_API_URL: 'https://auth.{{hostname}}/', diff --git a/src/tests/util.ts b/src/tests/util.ts index f5e84affa..62bd39d77 100644 --- a/src/tests/util.ts +++ b/src/tests/util.ts @@ -6,8 +6,7 @@ * OpenCRVS is also distributed under the terms of the Civil Registration * & Healthcare Disclaimer located at http://opencrvs.org/license. * - * Copyright (C) The OpenCRVS Authors. OpenCRVS and the OpenCRVS - * graphic logo are (registered/a) trademark(s) of Plan International. + * Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS. */ export function createServerWithEnvironment(env: any) { jest.resetModules() diff --git a/src/utils/address-utils.ts b/src/utils/address-utils.ts index 5249079e0..38e0c4213 100644 --- a/src/utils/address-utils.ts +++ b/src/utils/address-utils.ts @@ -6,8 +6,7 @@ * OpenCRVS is also distributed under the terms of the Civil Registration * & Healthcare Disclaimer located at http://opencrvs.org/license. * - * Copyright (C) The OpenCRVS Authors. OpenCRVS and the OpenCRVS - * graphic logo are (registered/a) trademark(s) of Plan International. + * Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS. */ import { MessageDescriptor } from 'react-intl' diff --git a/src/utils/index.ts b/src/utils/index.ts index 0cda5a9c3..338342596 100644 --- a/src/utils/index.ts +++ b/src/utils/index.ts @@ -6,8 +6,7 @@ * OpenCRVS is also distributed under the terms of the Civil Registration * & Healthcare Disclaimer located at http://opencrvs.org/license. * - * Copyright (C) The OpenCRVS Authors. OpenCRVS and the OpenCRVS - * graphic logo are (registered/a) trademark(s) of Plan International. + * Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS. */ import fetch from 'node-fetch' diff --git a/src/utils/mapping/field-mapping-utils.ts b/src/utils/mapping/field-mapping-utils.ts index 427418b50..8839d3bef 100644 --- a/src/utils/mapping/field-mapping-utils.ts +++ b/src/utils/mapping/field-mapping-utils.ts @@ -6,8 +6,7 @@ * OpenCRVS is also distributed under the terms of the Civil Registration * & Healthcare Disclaimer located at http://opencrvs.org/license. * - * Copyright (C) The OpenCRVS Authors. OpenCRVS and the OpenCRVS - * graphic logo are (registered/a) trademark(s) of Plan International. + * Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS. */ import { diff --git a/src/utils/mapping/section/birth/mapping-utils.ts b/src/utils/mapping/section/birth/mapping-utils.ts index 5f979bc64..6c0e8061b 100644 --- a/src/utils/mapping/section/birth/mapping-utils.ts +++ b/src/utils/mapping/section/birth/mapping-utils.ts @@ -6,8 +6,7 @@ * OpenCRVS is also distributed under the terms of the Civil Registration * & Healthcare Disclaimer located at http://opencrvs.org/license. * - * Copyright (C) The OpenCRVS Authors. OpenCRVS and the OpenCRVS - * graphic logo are (registered/a) trademark(s) of Plan International. + * Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS. */ import { certificateHandlebars } from '@countryconfig/form/birth/certificate-handlebars' diff --git a/src/utils/mapping/section/death/mapping-utils.ts b/src/utils/mapping/section/death/mapping-utils.ts index d65271248..dac0e47b1 100644 --- a/src/utils/mapping/section/death/mapping-utils.ts +++ b/src/utils/mapping/section/death/mapping-utils.ts @@ -6,8 +6,7 @@ * OpenCRVS is also distributed under the terms of the Civil Registration * & Healthcare Disclaimer located at http://opencrvs.org/license. * - * Copyright (C) The OpenCRVS Authors. OpenCRVS and the OpenCRVS - * graphic logo are (registered/a) trademark(s) of Plan International. + * Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS. */ import { certificateHandlebars } from '@countryconfig/form/death/certficate-handlebars' diff --git a/src/utils/mapping/section/marriage/mapping-utils.ts b/src/utils/mapping/section/marriage/mapping-utils.ts index a49c2eb43..1b61142ee 100644 --- a/src/utils/mapping/section/marriage/mapping-utils.ts +++ b/src/utils/mapping/section/marriage/mapping-utils.ts @@ -6,8 +6,7 @@ * OpenCRVS is also distributed under the terms of the Civil Registration * & Healthcare Disclaimer located at http://opencrvs.org/license. * - * Copyright (C) The OpenCRVS Authors. OpenCRVS and the OpenCRVS - * graphic logo are (registered/a) trademark(s) of Plan International. + * Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS. */ import { certificateHandlebars } from '@countryconfig/form/marriage/certificate-handlebars' diff --git a/src/validate-translations.ts b/src/validate-translations.ts index 84503b649..b3f1935e6 100644 --- a/src/validate-translations.ts +++ b/src/validate-translations.ts @@ -6,8 +6,7 @@ * OpenCRVS is also distributed under the terms of the Civil Registration * & Healthcare Disclaimer located at http://opencrvs.org/license. * - * Copyright (C) The OpenCRVS Authors. OpenCRVS and the OpenCRVS - * graphic logo are (registered/a) trademark(s) of Plan International. + * Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS. */ import chalk from 'chalk' import * as fs from 'fs' diff --git a/start-prod.sh b/start-prod.sh index c7c300f31..fa9d4c970 100755 --- a/start-prod.sh +++ b/start-prod.sh @@ -5,8 +5,7 @@ # OpenCRVS is also distributed under the terms of the Civil Registration # & Healthcare Disclaimer located at http://opencrvs.org/license. # -# Copyright (C) The OpenCRVS Authors. OpenCRVS and the OpenCRVS -# graphic logo are (registered/a) trademark(s) of Plan International. +# Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS. set -e diff --git a/test/cert.key.pub b/test/cert.key.pub index f513f125b..288288b90 100644 --- a/test/cert.key.pub +++ b/test/cert.key.pub @@ -6,8 +6,7 @@ file, You can obtain one at https://mozilla.org/MPL/2.0/. OpenCRVS is also distributed under the terms of the Civil Registration & Healthcare Disclaimer located at http://opencrvs.org/license. -Copyright (C) The OpenCRVS Authors. OpenCRVS and the OpenCRVS -graphic logo are (registered/a) trademark(s) of Plan International. +Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS. */ -----BEGIN PUBLIC KEY----- MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAtBwLvOdY3VAQuaHGWLrK diff --git a/test/setupJest.ts b/test/setupJest.ts index 482e8810f..e90b7daaf 100644 --- a/test/setupJest.ts +++ b/test/setupJest.ts @@ -6,8 +6,7 @@ * OpenCRVS is also distributed under the terms of the Civil Registration * & Healthcare Disclaimer located at http://opencrvs.org/license. * - * Copyright (C) The OpenCRVS Authors. OpenCRVS and the OpenCRVS - * graphic logo are (registered/a) trademark(s) of Plan International. + * Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS. */ import fetchMock, { enableFetchMocks } from 'jest-fetch-mock' import { readFileSync } from 'fs' diff --git a/typings/country-data.d.ts b/typings/country-data.d.ts index 00f50d150..7f2dd2e33 100644 --- a/typings/country-data.d.ts +++ b/typings/country-data.d.ts @@ -6,7 +6,6 @@ * OpenCRVS is also distributed under the terms of the Civil Registration * & Healthcare Disclaimer located at http://opencrvs.org/license. * - * Copyright (C) The OpenCRVS Authors. OpenCRVS and the OpenCRVS - * graphic logo are (registered/a) trademark(s) of Plan International. + * Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS. */ declare module 'country-data' diff --git a/typings/hapi-sentry.d.ts b/typings/hapi-sentry.d.ts index ea71ebc0c..1339bb02d 100644 --- a/typings/hapi-sentry.d.ts +++ b/typings/hapi-sentry.d.ts @@ -6,7 +6,6 @@ * OpenCRVS is also distributed under the terms of the Civil Registration * & Healthcare Disclaimer located at http://opencrvs.org/license. * - * Copyright (C) The OpenCRVS Authors. OpenCRVS and the OpenCRVS - * graphic logo are (registered/a) trademark(s) of Plan International. + * Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS. */ declare module 'hapi-sentry' diff --git a/typings/niceware.d.ts b/typings/niceware.d.ts index 01f733ce0..a04d982a0 100644 --- a/typings/niceware.d.ts +++ b/typings/niceware.d.ts @@ -6,7 +6,6 @@ * OpenCRVS is also distributed under the terms of the Civil Registration * & Healthcare Disclaimer located at http://opencrvs.org/license. * - * Copyright (C) The OpenCRVS Authors. OpenCRVS and the OpenCRVS - * graphic logo are (registered/a) trademark(s) of Plan International. + * Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS. */ declare module 'niceware' diff --git a/typings/pdfmake.d.ts b/typings/pdfmake.d.ts index e9e5b5997..6af597164 100644 --- a/typings/pdfmake.d.ts +++ b/typings/pdfmake.d.ts @@ -6,8 +6,7 @@ * OpenCRVS is also distributed under the terms of the Civil Registration * & Healthcare Disclaimer located at http://opencrvs.org/license. * - * Copyright (C) The OpenCRVS Authors. OpenCRVS and the OpenCRVS - * graphic logo are (registered/a) trademark(s) of Plan International. + * Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS. */ declare module 'pdfmake/build/pdfmake' { let vfs: TFontFamily From 1755844d8953b650d1f09325d9a3f91a5df04aae Mon Sep 17 00:00:00 2001 From: euanmillar Date: Mon, 2 Oct 2023 18:40:57 +0100 Subject: [PATCH 05/10] Create script to publish images to Dockerhub --- .github/workflows/publish-release.yml | 37 +++++++++++++++++++++++++++ package.json | 2 -- 2 files changed, 37 insertions(+), 2 deletions(-) create mode 100644 .github/workflows/publish-release.yml diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml new file mode 100644 index 000000000..02d8223cf --- /dev/null +++ b/.github/workflows/publish-release.yml @@ -0,0 +1,37 @@ +name: Publish release + +on: + push: + branches: + - master + - develop + - main + workflow_dispatch: + inputs: + branch_name: + description: Branch to build from + default: develop + required: true +jobs: + push: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + if: github.event_name == 'workflow_dispatch' + with: + ref: '${{ github.event.inputs.branch_name }}' + - uses: actions/checkout@v2 + if: github.event_name == 'push' + - name: Login to DockerHub + uses: docker/login-action@v1 + with: + username: ${{ secrets.DOCKER_USERNAME }} + password: ${{ secrets.DOCKER_PASSWORD }} + - name: Push image + env: + DOCKERHUB_ACCOUNT: ${{ secrets.DOCKERHUB_ACCOUNT }} + DOCKERHUB_REPO: ${{ secrets.DOCKERHUB_REPO }} + run: | + export COUNTRY_CONFIG_VERSION=`git describe --tags --abbrev=0` + echo "Publishing a Docker image with a tag $COUNTRY_CONFIG_VERSION" + bash build-and-push.sh && unset COUNTRY_CONFIG_VERSION diff --git a/package.json b/package.json index 08e20f96c..1dda48303 100644 --- a/package.json +++ b/package.json @@ -21,8 +21,6 @@ "test:compilation": "tsc --noEmit", "start": "cross-env NODE_ENV=development nodemon --exec ts-node -r tsconfig-paths/register src/index.ts", "start:prod": "ts-node --transpile-only -r tsconfig-paths/register src/index.ts", - "compose:push:version": "export COUNTRY_CONFIG_VERSION=`git log -1 --pretty=format:%h` && bash build-and-push.sh && unset COUNTRY_CONFIG_VERSION", - "compose:push:release": "export COUNTRY_CONFIG_VERSION=`git describe --tags --abbrev=0` && bash build-and-push.sh && unset COUNTRY_CONFIG_VERSION", "data-generator": "ts-node -r tsconfig-paths/register -T src/data-generator/index.ts", "data-generator:generate-types": "graphql-codegen --config codegen.yml && yarn prettier --write src/data-generator/gateway.ts", "deploy": "bash infrastructure/deploy.sh", From 29fbec12436128b522e4757983fe91e6885df980 Mon Sep 17 00:00:00 2001 From: euanmillar Date: Mon, 2 Oct 2023 18:55:57 +0100 Subject: [PATCH 06/10] fix release workflow from running on a merge --- .github/workflows/publish-release.yml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml index 02d8223cf..fa806f442 100644 --- a/.github/workflows/publish-release.yml +++ b/.github/workflows/publish-release.yml @@ -1,19 +1,18 @@ name: Publish release on: - push: - branches: - - master - - develop - - main workflow_dispatch: inputs: branch_name: description: Branch to build from default: develop required: true -jobs: push: + branches: + - 'develop' + +jobs: + base: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 From 9413e355c9d94a7a57a542742d8b2861e39a87dc Mon Sep 17 00:00:00 2001 From: euanmillar Date: Mon, 2 Oct 2023 20:44:00 +0100 Subject: [PATCH 07/10] Modify release action to build based on input --- .github/workflows/publish-release.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml index fa806f442..ab7b08256 100644 --- a/.github/workflows/publish-release.yml +++ b/.github/workflows/publish-release.yml @@ -7,9 +7,9 @@ on: description: Branch to build from default: develop required: true - push: - branches: - - 'develop' + release_version: + description: Release version number + required: true jobs: base: @@ -31,6 +31,6 @@ jobs: DOCKERHUB_ACCOUNT: ${{ secrets.DOCKERHUB_ACCOUNT }} DOCKERHUB_REPO: ${{ secrets.DOCKERHUB_REPO }} run: | - export COUNTRY_CONFIG_VERSION=`git describe --tags --abbrev=0` + export COUNTRY_CONFIG_VERSION=${{ github.event.inputs.release_version }} echo "Publishing a Docker image with a tag $COUNTRY_CONFIG_VERSION" bash build-and-push.sh && unset COUNTRY_CONFIG_VERSION From 28d152c1e3e726531ebbbdb136e4d31542d9b4f4 Mon Sep 17 00:00:00 2001 From: euanmillar Date: Mon, 2 Oct 2023 21:02:48 +0100 Subject: [PATCH 08/10] Test approver flow --- .github/workflows/publish-release.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml index ab7b08256..367536a9b 100644 --- a/.github/workflows/publish-release.yml +++ b/.github/workflows/publish-release.yml @@ -15,6 +15,14 @@ jobs: base: runs-on: ubuntu-latest steps: + - uses: trstringer/manual-approval@v1 + with: + secret: ${{ github.TOKEN }} + approvers: euanmillar + minimum-approvals: 1 + issue-title: "Pushing release: ${{ github.event.inputs.branch_name }} to OpenCRVS" + issue-body: "Please approve or deny the publishing of release ${{ github.event.inputs.branch_name }}" + exclude-workflow-initiator-as-approver: false - uses: actions/checkout@v2 if: github.event_name == 'workflow_dispatch' with: From dba4a7346dd3275944521e23ae2017268e390e45 Mon Sep 17 00:00:00 2001 From: euanmillar Date: Mon, 2 Oct 2023 21:54:00 +0100 Subject: [PATCH 09/10] Fix approval message --- .github/workflows/publish-release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml index 367536a9b..674bb50ec 100644 --- a/.github/workflows/publish-release.yml +++ b/.github/workflows/publish-release.yml @@ -20,8 +20,8 @@ jobs: secret: ${{ github.TOKEN }} approvers: euanmillar minimum-approvals: 1 - issue-title: "Pushing release: ${{ github.event.inputs.branch_name }} to OpenCRVS" - issue-body: "Please approve or deny the publishing of release ${{ github.event.inputs.branch_name }}" + issue-title: "Release: ${{ github.event.inputs.release_version }}" + issue-body: "Please approve or deny the publishing of release: ${{ github.event.inputs.release_version }} to Dockerhub" exclude-workflow-initiator-as-approver: false - uses: actions/checkout@v2 if: github.event_name == 'workflow_dispatch' From db32c4c1e386a12e483c0d5b02167bdd2b5b0133 Mon Sep 17 00:00:00 2001 From: euanmillar Date: Mon, 2 Oct 2023 21:57:03 +0100 Subject: [PATCH 10/10] Add Riku] --- .github/workflows/publish-release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml index 674bb50ec..f6b3c3196 100644 --- a/.github/workflows/publish-release.yml +++ b/.github/workflows/publish-release.yml @@ -18,7 +18,7 @@ jobs: - uses: trstringer/manual-approval@v1 with: secret: ${{ github.TOKEN }} - approvers: euanmillar + approvers: euanmillar,rikukissa minimum-approvals: 1 issue-title: "Release: ${{ github.event.inputs.release_version }}" issue-body: "Please approve or deny the publishing of release: ${{ github.event.inputs.release_version }} to Dockerhub"