Server setup updates (#34)

* Updates for sedish server

* HAPI config updates

.env

@@ -15,5 +15,3 @@ OPENHIM_PORT=9201
 
 ISANTEPLUS_DB_PORT=3307
 OPENMRS_DB_PORT=3308
-
-

.gitignore

@@ -45,3 +45,5 @@ server/log
 *.log
 
 hapi.properties
+configs/shr/.env
+configs/opencr-hapi/.env

configs/opencr-hapi/.env.template

@@ -0,0 +1,4 @@
+SHR_DATABASE_URL=
+SHR_DATABASE_USERNAME=
+SHR_DATABASE_PW=
+JAVA_OPTS='-Dspring.datasource.url=${SHR_DATABASE_URL} -Dspring.datasource.username=${SHR_DATABASE_USERNAME} -Dspring.datasource.password=${SHR_DATABASE_PW} -Dspring.datasource.driverClassName=org.postgresql.Driver'

configs/opencr/config_docker_template.json

@@ -73,7 +73,7 @@
     }
   },
   "sync": {
-    "lastFHIR2ESSync": "2021-10-03T02:16:30"
+    "lastFHIR2ESSync": "2021-10-14T18:31:24"
   },
   "__comments": {
     "matching.tool": "this tells if the app should use mediator algorithms or elasticsearch algorithms for matching, two options mediator and elasticsearch"

configs/opencr/mediator.json

@@ -1,13 +1,11 @@
 {
     "urn": "urn:uuid:4bc42b2f-b5a8-473d-8207-5dd5c61f0c4a",
-    "version": "1.0.0",
+    "version": "1.0.3",
     "name": "Client Registry",
     "description": "Haiti Client Registry",
     "config": {
         "fhirServer": {
-            "username": "hapi",
-            "password": "hapi",
-            "baseURL": "http://opencr-fhir/fhir"
+            "baseURL": "http://opencr-fhir:8080/fhir"
         },
         "elastic": {
             "server": "http://es:9200",

configs/shr/.env.template

@@ -0,0 +1,4 @@
+SHR_DATABASE_URL=
+SHR_DATABASE_USERNAME=
+SHR_DATABASE_PW=
+JAVA_OPTS='-Dspring.datasource.url=${SHR_DATABASE_URL} -Dspring.datasource.username=${SHR_DATABASE_USERNAME} -Dspring.datasource.password=${SHR_DATABASE_PW} -Dspring.datasource.driverClassName=org.postgresql.Driver'

docker-compose.yml

@@ -55,11 +55,12 @@ services:
   opencr:
     container_name: opencr
     hostname: opencr
+    #image: intrahealth/opencr:latest
     image: intrahealth/opencr:fdb3d44
     restart: unless-stopped
     environment:
       - NODE_ENV=docker
-      - HAPI_FHIR_URL=http://opencr-fhir:8080/hapi-fhir-jpaserver/fhir/metadata
+      - HAPI_FHIR_URL=http://opencr-fhir:8080/fhir/metadata
     networks:
       - sedish
     volumes:
@@ -76,9 +77,8 @@ services:
     restart: unless-stopped
     volumes:
       - cr-data:/data/hapi
-      - ./configs/opencr-hapi/hapi.properties:/conf/hapi/hapi.properties
-    environment:
-      JAVA_OPTS: '-Dhapi.properties=/conf/hapi/hapi.properties'
+    env_file:
+      - configs/opencr-hapi/.env
     networks:
       - sedish
 
@@ -87,6 +87,8 @@ services:
     hostname: es
     image: intrahealth/elasticsearch:latest
     restart: unless-stopped
+    ports:
+      - 9200
     environment:
       - node.name=es01
       - discovery.type=single-node
@@ -120,9 +122,8 @@ services:
     restart: unless-stopped
     volumes:
       - hapi-data:/data/hapi
-      - ./configs/shr/hapi.properties:/conf/hapi/hapi.properties
-    environment:
-      JAVA_OPTS: '-Dhapi.properties=/conf/hapi/hapi.properties'
+    env_file:
+      - configs/shr/.env
     networks:
       - sedish
 
@@ -144,7 +145,7 @@ services:
   isanteplus-test:
     container_name: isanteplus-test
     hostname: isanteplus-test
-    build: ./docker/openmrs-server-2
+    build: ./docker/openmrs-server
     restart: unless-stopped
     env_file:
         - ./openmrs/isanteplus_test/openmrs-server.env