Merge pull request #3 from indexdata/rename-md-url

Rename MD_URL to MODULE_URL

Author: jakub-id

README.md

@@ -7,11 +7,11 @@ The container can be used as a
 
 | env                  | Description                                                 |
 |----------------------|-------------------------------------------------------------|
-| `MD_URL`             | URL of running module instance                              |
+| `MODULE_URL`         | URL of running module instance                              |
 | `OKAPI_MD`           | Module descriptor content                                   |
 | `OKAPI_TENANTS`      | Glob list of tenants separated by comma or space            |
 | `OKAPI_ADMIN_TENANT` | Glob list of admin tenants - default is `supertenant`       |
 | `OKAPI_URL`          | Okapi URL                                                   |
 | `OKAPI_USER`         | Username for admin tenant                                   |
 | `OKAPI_PASS`         | Password for admin tenant                                   |
-| `OKAPI_TOKEN`        | Token for admin tenant                                      |
+| `OKAPI_TOKEN`        | Token for admin tenant                                      |

okapi-hooks.sh

@@ -47,7 +47,7 @@ hook_pre_delete() {
 
 hook_post_install() {
 	echo $OKAPI_MD | post -f -d @- $U/_/proxy/modules
-	echo "{\"srvcId\":\"$SVCID\",\"instId\":\"${INSTID}\",\"url\":\"${MD_URL}\"}" | post -f -d @- $U/_/discovery/modules
+	echo "{\"srvcId\":\"$SVCID\",\"instId\":\"${INSTID}\",\"url\":\"${MODULE_URL}\"}" | post -f -d @- $U/_/discovery/modules
 	for T in $OKAPI_TENANTS; do
 		echo "[{ \"id\":\"${SVCID}\",\"action\":\"enable\"}]" | post -f -d @- $U/_/proxy/tenants/$T/install
 	done
@@ -99,8 +99,8 @@ prepare() {
 		echo "OKAPI_MD not set"
 		fail=true
 	fi
-	if test -z "$MD_URL"; then
-		echo "MD_URL not set"
+	if test -z "$MODULE_URL"; then
+		echo "MODULE_URL not set"
 		fail=true
 	fi
 	if ! which curl > /dev/null; then

testing.sh

@@ -17,7 +17,7 @@ trap handler EXIT
 sleep 1
 
 export OKAPI_URL=http://localhost:9130
-export MD_URL=http://localhost:8080
+export MODULE_URL=http://localhost:8080
 export OKAPI_TOKEN=none
 export OKAPI_MD=`cat $OKAPIHOME/okapi-test-module/target/ModuleDescriptor.json`
 TENANTS="t1 t2"
@@ -34,4 +34,3 @@ done
 for T in ${TENANTS}; do
 	curl -f ${OKAPI_URL}/_/proxy/tenants/$T/modules/${SVCID}
 done
-