From 461960e793f072f0a7566409b12b3b372c9a9159 Mon Sep 17 00:00:00 2001 From: Valentin Lab Date: Thu, 26 Jul 2018 13:51:59 +0200 Subject: [PATCH] chg: dev: [postgres,apache] action are not anymore executed from the charm's root. With version of ``0k-charm`` >= 0.3.0, actions script are not anymore executed from charm's root : they stay in current directory. --- apache/actions/load | 2 +- postgres/actions/load | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apache/actions/load b/apache/actions/load index 92afe4c..476d620 100755 --- a/apache/actions/load +++ b/apache/actions/load @@ -41,7 +41,7 @@ if [ -z "$DOMAIN" ]; then fi -. lib/common +. "$CHARM_PATH"/lib/common set -e diff --git a/postgres/actions/load b/postgres/actions/load index 199b02c..ce43348 100755 --- a/postgres/actions/load +++ b/postgres/actions/load @@ -51,7 +51,7 @@ if [[ "$dbname" == *"@"* ]]; then IFS="@" read user dbname < <(echo "$dbname") fi -. lib/common +. "$CHARM_PATH/lib/common" ## This can work only if ~/.pgpass is correctly created by init.