Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refine OpenFn configuration #81

Merged
merged 1 commit into from
Dec 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion distro/configs/openfn/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
1 change: 1 addition & 0 deletions distro/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions scripts/run_msf_addons.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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."
Expand Down
6 changes: 4 additions & 2 deletions scripts/secrets/azure.msf.env
Original file line number Diff line number Diff line change
Expand Up @@ -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'

Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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


Expand Down
4 changes: 3 additions & 1 deletion scripts/secrets/local.msf.env
Original file line number Diff line number Diff line change
Expand Up @@ -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'

Expand Down Expand Up @@ -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


Expand Down