diff --git a/hedgedoc/hooks/init b/hedgedoc/hooks/init index 56997ce..eb89fbe 100755 --- a/hedgedoc/hooks/init +++ b/hedgedoc/hooks/init @@ -7,6 +7,6 @@ $SERVICE_NAME: " ## ``codimd`` create uploads folder with wrong permission - -mkdir -p "$SERVICE_DATASTORE/home/hackmd/app/public/uploads" -chown -R 1500:1500 "$SERVICE_DATASTORE/home/hackmd/app/public/" +uid=$(docker_get_uid "$SERVICE_NAME" "hedgedoc") +mkdir -p "$SERVICE_DATASTORE/hedgedoc/public/uploads" +chown "$uid" "$SERVICE_DATASTORE/hedgedoc/public/uploads" diff --git a/hedgedoc/hooks/web_proxy-relation-joined b/hedgedoc/hooks/web_proxy-relation-joined new file mode 100755 index 0000000..efbbd1f --- /dev/null +++ b/hedgedoc/hooks/web_proxy-relation-joined @@ -0,0 +1,22 @@ +#!/bin/bash + +set -e + +DOMAIN=$(relation-get domain) || exit 1 + +## These are mainly to setup the correct web-hook +if [ "$MASTER_BASE_SERVICE_NAME" == "$DOMAIN" ]; then + ## This is because the IP will be the docker container version + USESSL="" +else + USESSL="CMD_PROTOCOL_USESSL: 'true'" +fi + +config-add "\ +services: + $MASTER_BASE_SERVICE_NAME: + environment: + CMD_DOMAIN: $DOMAIN + $USESSL +" + diff --git a/hedgedoc/metadata.yml b/hedgedoc/metadata.yml index 0a70eb5..d17ee1e 100644 --- a/hedgedoc/metadata.yml +++ b/hedgedoc/metadata.yml @@ -1,6 +1,6 @@ -docker-image: docker.0k.io/hedgedoc:1.7.0 ## from: quay.io/hedgedoc/hedgedoc:1.7.0-alpine +docker-image: docker.0k.io/hedgedoc:1.7.2 ## from: quay.io/hedgedoc/hedgedoc:1.7.2-alpine data-resources: - - /home/hackmd/app/public/uploads + - /hedgedoc/public/uploads default-options: