OZ-573: Separate OpenMRS SSO configs + binaries to its own dir

ozone-his · Nov 14, 2024 · 895f217 · 895f217
1 parent 330d441
commit 895f217
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/docker-compose-openmrs-sso.yml b/docker-compose-openmrs-sso.yml
@@ -5,15 +5,15 @@ services:
     volumes:
       - "${OPENMRS_SSO_PROPERTIES_PATH}/oauth2.properties:/openmrs/data/oauth2.properties"
       - "${OPENMRS_SSO_MODULES_PATH:-openmrs-modules}/${oauth2loginArtifactId}-${oauth2loginVersion}.omod:/openmrs/distribution/openmrs_modules/${oauth2loginArtifactId}-${oauth2loginVersion}.omod"
-      - "${OPENMRS_SSO_CONFIG_PATH:-openmrs-config}/globalproperties/oauth2-login-props.xml:/openmrs/distribution/openmrs_config/globalproperties/oauth2-login-props.xml"
       - "${OPENMRS_SSO_CONFIG_PATH:-openmrs-config}/liquibase/liquibase.xml:/openmrs/distribution/openmrs_config/liquibase/liquibase.xml"
+      - "${OPENMRS_SSO_CONFIG_PATH:-openmrs-config}/globalproperties/oauth2-login-props.xml:/openmrs/distribution/openmrs_config/globalproperties/oauth2-login-props.xml"
       - "./openmrs/tomcat/server.xml:/usr/local/tomcat/conf/server.xml"
 
   frontend:
     environment:
       - SPA_CONFIG_URLS=${SPA_CONFIG_URLS},/openmrs/spa/configs/ozone-sso-frontend-config.json
     volumes:
-      - "${OPENMRS_SSO_FRONTEND_CONFIG_PATH}/ozone-sso-frontend-config.json:/usr/share/nginx/html/configs/ozone-sso-frontend-config.json"
+      - "${OPENMRS_SSO_FRONTEND_CONFIG_PATH}/*:/usr/share/nginx/html/configs/"
 
   env-substitution:
     environment:

diff --git a/scripts/utils.sh b/scripts/utils.sh
@@ -26,9 +26,9 @@ function exportPaths () {
     export OPENMRS_PROPERTIES_PATH=$DISTRO_PATH/configs/openmrs/properties
     export OPENMRS_TOMCAT_CONFIG_PATH=$DISTRO_PATH/configs/openmrs/tomcat
     export OPENMRS_MODULES_PATH=$DISTRO_PATH/binaries/openmrs/modules
-    export OPENMRS_SSO_MODULES_PATH=$DISTRO_PATH/binaries/openmrs_sso/modules
-    export OPENMRS_SSO_CONFIG_PATH=$DISTRO_PATH/configs/openmrs_sso/initializer_config
-    export OPENMRS_SSO_PROPERTIES_PATH=$DISTRO_PATH/configs/openmrs_sso/properties
+    export OPENMRS_SSO_MODULES_PATH=$DISTRO_PATH/binaries/openmrs/modules_sso
+    export OPENMRS_SSO_CONFIG_PATH=$DISTRO_PATH/configs/openmrs/initializer_config_sso
+    export OPENMRS_SSO_PROPERTIES_PATH=$DISTRO_PATH/configs/openmrs/properties_sso
     export SPA_PATH=/openmrs/spa
     export SENAITE_CONFIG_PATH=$DISTRO_PATH/configs/senaite/initializer_config
     export SENAITE_OIDC_CONFIG_PATH=$DISTRO_PATH/configs/senaite/oidc
@@ -40,7 +40,7 @@ function exportPaths () {
     export EIP_ERPNEXT_OPENMRS_ROUTES_PATH=$DISTRO_PATH/binaries/eip-erpnext-openmrs
     export OPENMRS_FRONTEND_BINARY_PATH=$DISTRO_PATH/binaries/openmrs/frontend
     export OPENMRS_FRONTEND_CONFIG_PATH=$DISTRO_PATH/configs/openmrs/frontend_config/
-    export OPENMRS_SSO_FRONTEND_CONFIG_PATH=$DISTRO_PATH/configs/openmrs_sso/frontend_config/
+    export OPENMRS_SSO_FRONTEND_CONFIG_PATH=$DISTRO_PATH/configs/openmrs/frontend_config_sso/
     export SQL_SCRIPTS_PATH=$DISTRO_PATH/data/
     export ERPNEXT_CONFIG_PATH=$DISTRO_PATH/configs/erpnext/initializer_config/
     export ERPNEXT_SCRIPTS_PATH=$DISTRO_PATH/binaries/erpnext/scripts/
@@ -50,6 +50,9 @@ function exportPaths () {
     echo "→ OPENMRS_PROPERTIES_PATH=$OPENMRS_PROPERTIES_PATH"
     echo "→ OPENMRS_MODULES_PATH=$OPENMRS_MODULES_PATH"
     echo "→ OPENMRS_TOMCAT_CONFIG_PATH=$OPENMRS_TOMCAT_CONFIG_PATH"
+    echo "→ OPENMRS_SSO_MODULES_PATH=$OPENMRS_SSO_MODULES_PATH"
+    echo "→ OPENMRS_SSO_CONFIG_PATH=$OPENMRS_SSO_CONFIG_PATH"
+    echo "→ OPENMRS_SSO_PROPERTIES_PATH=$OPENMRS_SSO_PROPERTIES_PATH"
     echo "→ SPA_PATH=$SPA_PATH"
     echo "→ SENAITE_CONFIG_PATH=$SENAITE_CONFIG_PATH"
     echo "→ SENAITE_OIDC_CONFIG_PATH=$SENAITE_OIDC_CONFIG_PATH"
@@ -60,6 +63,7 @@ function exportPaths () {
     echo "→ EIP_OPENMRS_SENAITE_ROUTES_PATH=$EIP_OPENMRS_SENAITE_ROUTES_PATH"
     echo "→ EIP_ERPNEXT_OPENMRS_ROUTES_PATH=$EIP_ERPNEXT_OPENMRS_ROUTES_PATH"
     echo "→ OPENMRS_FRONTEND_CONFIG_PATH=$OPENMRS_FRONTEND_CONFIG_PATH"
+    echo "→ OPENMRS_SSO_FRONTEND_CONFIG_PATH=$OPENMRS_SSO_FRONTEND_CONFIG_PATH"
     echo "→ SQL_SCRIPTS_PATH=$SQL_SCRIPTS_PATH"
     echo "→ ERPNEXT_CONFIG_PATH=$ERPNEXT_CONFIG_PATH"
     echo "→ ERPNEXT_SCRIPTS_PATH=$ERPNEXT_SCRIPTS_PATH"