diff --git a/hooks/config-changed b/hooks/config-changed index 3ff2fe7..26fdba3 100755 --- a/hooks/config-changed +++ b/hooks/config-changed @@ -101,7 +101,7 @@ service apache2 reload application-version-set $(dpkg -s mediawiki | grep '^Version:' | awk -F':' '{print $3}' | cut -d+ -f1) -if [ -f db-connected ]; then +if [ -f "${CHARM_DIR}/db-connected" ]; then status-set active "Ready" else status-set blocked "Database required" diff --git a/hooks/db-relation-departed b/hooks/db-relation-departed index bcf5660..09576c7 100755 --- a/hooks/db-relation-departed +++ b/hooks/db-relation-departed @@ -3,7 +3,7 @@ set -xe juju-log "db relation removed, shutting down" -rm -f db-connected +rm -f "${CHARM_DIR}/db-connected" rm -f /etc/mediawiki/LocalSettings.php diff --git a/hooks/db-relation-joined b/hooks/db-relation-joined index e1b750b..cd2d7e9 100755 --- a/hooks/db-relation-joined +++ b/hooks/db-relation-joined @@ -1,3 +1,3 @@ #!/bin/sh -touch db-connected +touch "${CHARM_DIR}/db-connected"