Refine OpenFn configuration (#81)

MSF-OCG · Dec 10, 2024 · 08d3a25 · 08d3a25
1 parent 20c6559
commit 08d3a25
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 6 deletions.
diff --git a/distro/configs/openfn/config.json b/distro/configs/openfn/config.json
@@ -2,5 +2,5 @@
   "endpoint": "http://localhost:4000",
   "statePath": "./projectState.json",
   "specPath": "./openfn-project.yaml",
-  "apiKey": "some_key"
+  "apiKey": "please_generate_a_more_secure_unique_secret_value_for_your_project"
 }
diff --git a/distro/pom.xml b/distro/pom.xml
@@ -267,6 +267,7 @@
                 <concat destfile="${project.build.directory}/${project.artifactId}-${project.version}/run/docker/.env" append="true">
                   <filelist dir="${project.build.directory}/${project.artifactId}-${project.version}/run/docker" files="${envFileToInclude}"/>
                 </concat>
+                <delete file="${project.build.directory}/${project.artifactId}-${project.version}/run/docker/${envFileToInclude}"/>
               </target>
             </configuration>
           </execution>

diff --git a/scripts/run_msf_addons.sh b/scripts/run_msf_addons.sh
@@ -20,12 +20,12 @@ echo "$INFO Creating OpenFn admin user..."
                 %{
                     name: "openmrs",
                     schema: "raw",
-                    body: %{"username" => System.get_env("MSF_OPENMRS_USERNAME"), "password" => System.get_env("MSF_OPENMRS_PASSWORD")}
+                    body: %{"username" => System.get_env("MSF_OPENMRS_USERNAME"), "instanceUrl" => System.get_env("MSF_OPENMRS_INSTANCE_URL"), "password" => System.get_env("MSF_OPENMRS_PASSWORD")}
                 },
                 %{
                     name: "dhis2",
                     schema: "raw",
-                    body: %{"username" => System.get_env("MSF_DHIS2_USERNAME"), "password" => System.get_env("MSF_DHIS2_PASSWORD")}
+                    body: %{"username" => System.get_env("MSF_DHIS2_USERNAME"), "hostUrl" => System.get_env("MSF_DHIS2_HOST_URL"), "password" => System.get_env("MSF_DHIS2_PASSWORD")}
                 }
             ]
         )'  && echo "$INFO Creating OpenFn admin user completed successfully."

diff --git a/scripts/secrets/azure.msf.env b/scripts/secrets/azure.msf.env
@@ -26,7 +26,7 @@ OPENFN_HOSTNAME=openfn-172-17-0-1.traefik.me
 # Choose an admin email address and configure a mailer. If you don't specify
 # mailer details the local test adaptor will be used and mail previews can be
 # viewed at localhost:4000/dev/mailbox
-EMAIL_ADMIN='admin@openfn.org'
+EMAIL_ADMIN='michael.bontyes@madiro.org'
 # MAILGUN_API_KEY='some-key'
 # MAILGUN_DOMAIN='some-domain'
 
@@ -65,7 +65,7 @@ LISTEN_ADDRESS=0.0.0.0
 PORT=4000
 
 # The origins from which you want to allow requests (comma separated)
-ORIGINS=//lime-mosul-uat.madiro.org:4000,//msf-ocg-openmrs3-dev.westeurope.cloudapp.azure.com:443,//msf-ocg-openmrs3-dev.westeurope.cloudapp.azure.com:80,//msf-ocg-openmrs3-dev.westeurope.cloudapp.azure.com:4000,//openfn-172-17-0-1.traefik.me,//openfn-192-168-18-6.traefik.me
+ORIGINS=//lime-mosul-uat.madiro.org:4000,//lime-mosul-dev.madiro.org:4000,//msf-ocg-openmrs3-dev.westeurope.cloudapp.azure.com:443,//msf-ocg-openmrs3-dev.westeurope.cloudapp.azure.com:80,//msf-ocg-openmrs3-dev.westeurope.cloudapp.azure.com:4000,//openfn-172-17-0-1.traefik.me,//openfn-192-168-18-6.traefik.me
 
 # You can configure error reporting via Sentry by providing a DSN.
 # SENTRY_DSN=https://some-url.ingest.sentry.io/some-id
@@ -200,10 +200,12 @@ MSF_OPENFN_PASSWORD=Admin1234567
 
 # MSF OpenMRS account
 MSF_OPENMRS_USERNAME=admin
+MSF_OPENMRS_INSTANCE_URL=http://msf-ocg-openmrs3-dev.westeurope.cloudapp.azure.com/openmrs
 MSF_OPENMRS_PASSWORD=Admin123
 
 # MSF DHIS2 account
 MSF_DHIS2_USERNAME=admin
+MSF_DHIS2_HOST_URL=https://dhis2-uat.ocg.msf.org
 MSF_DHIS2_PASSWORD=Admin123
 
 

diff --git a/scripts/secrets/local.msf.env b/scripts/secrets/local.msf.env
@@ -26,7 +26,7 @@ OPENFN_HOSTNAME=openfn-172-17-0-1.traefik.me
 # Choose an admin email address and configure a mailer. If you don't specify
 # mailer details the local test adaptor will be used and mail previews can be
 # viewed at localhost:4000/dev/mailbox
-EMAIL_ADMIN='admin@openfn.org'
+EMAIL_ADMIN='michael.bontyes@madiro.org'
 # MAILGUN_API_KEY='some-key'
 # MAILGUN_DOMAIN='some-domain'
 
@@ -204,10 +204,12 @@ MSF_OPENFN_PASSWORD=Admin1234567
 
 # MSF OpenMRS account
 MSF_OPENMRS_USERNAME=admin
+MSF_OPENMRS_INSTANCE_URL=http://localhost/openmrs
 MSF_OPENMRS_PASSWORD=Admin123
 
 # MSF DHIS2 account
 MSF_DHIS2_USERNAME=admin
+MSF_DHIS2_HOST_URL=http://localhost
 MSF_DHIS2_PASSWORD=Admin123