CanDIG/federation_service merging: Hotfix: respawn heartbeat, don"t c…

…heck your own heartbeat (#822)

* updating submodules

* pick up heartbeat fixes

---------

Co-authored-by: github-actions <github-actions@github.com>
Co-authored-by: Daisie Huang <daisieh@gmail.com>

etc/env/example.env

@@ -143,7 +143,8 @@ FEDERATION_SERVICE_URL=http://${CANDIG_INTERNAL_DOMAIN}:${FEDERATION_PORT}
 FEDERATION_PUBLIC_URL=${TYK_LOGIN_TARGET_URL}/federation
 FEDERATION_PRIVATE_URL=http://federation:${FEDERATION_PORT}
 FEDERATION_SERVICES=katsu htsget query
-FEDERATION_SELF_SERVER="{'id': 'internal-1', 'url': '${TYK_LOGIN_TARGET_URL}','location': {'name': '${CANDIG_SITE_LOCATION}','province': 'ON','province-code': 'ca-on'}}"
+FEDERATION_SELF_SERVER_ID=internal-1
+FEDERATION_SELF_SERVER="{'id': '${FEDERATION_SELF_SERVER_ID}', 'url': '${TYK_LOGIN_TARGET_URL}','location': {'name': '${CANDIG_SITE_LOCATION}','province': 'ON','province-code': 'ca-on'}}"
 
 
 # katsu metadata service

lib/federation/docker-compose.yml

@@ -33,6 +33,7 @@ services:
         VAULT_URL: ${VAULT_PRIVATE_URL}
         SERVICE_NAME: ${SERVICE_NAME}
         FEDERATION_SERVICE_URL: ${FEDERATION_SERVICE_URL}
+        FEDERATION_SELF_SERVER_ID: ${FEDERATION_SELF_SERVER_ID}
         DEBUG_MODE: ${CANDIG_DEBUG_MODE}
     extra_hosts:
         - "${CANDIG_DOMAIN}:${LOCAL_IP_ADDR}"