Fix vault file naming
This commit is contained in:
parent
b04afd85fb
commit
886671c313
@ -124,7 +124,7 @@ dokku-ansible-deploy-post-extract() {
|
|||||||
dokku_col_log_info1_quiet "Copied deploy.d files into place"
|
dokku_col_log_info1_quiet "Copied deploy.d files into place"
|
||||||
|
|
||||||
if [[ -d "$TMPDIR/deploy.d/vault" ]]; then
|
if [[ -d "$TMPDIR/deploy.d/vault" ]]; then
|
||||||
if [[ ! -f "$DOKKU_LIB_ROOT/data/deploy.d/$APP/.vault-password.sh" ]]; then
|
if [[ ! -f "$DOKKU_LIB_ROOT/data/deploy.d/$APP/.vault.sh" ]]; then
|
||||||
dokku_col_log_info1_quiet "Vault directory discovered but missing vault password"
|
dokku_col_log_info1_quiet "Vault directory discovered but missing vault password"
|
||||||
dokku_col_log_info1_quiet "Please run dokku ansible-deploy:vault-password $APP"
|
dokku_col_log_info1_quiet "Please run dokku ansible-deploy:vault-password $APP"
|
||||||
exit 1
|
exit 1
|
||||||
@ -141,7 +141,7 @@ dokku-ansible-deploy-pre-deploy() {
|
|||||||
|
|
||||||
declare APP="$1"
|
declare APP="$1"
|
||||||
declare APP_DIR="$DOKKU_LIB_ROOT/data/deploy.d/$APP"
|
declare APP_DIR="$DOKKU_LIB_ROOT/data/deploy.d/$APP"
|
||||||
declare VAULT_FILE="$APP_DIR/.vault-password.sh"
|
declare VAULT_FILE="$APP_DIR/.vault.sh"
|
||||||
declare PRE_DEPLOY="$PLUGIN_CORE_AVAILABLE_PATH/ansible-deploy/plays/pre_deploy.yml"
|
declare PRE_DEPLOY="$PLUGIN_CORE_AVAILABLE_PATH/ansible-deploy/plays/pre_deploy.yml"
|
||||||
|
|
||||||
dokku_col_log_info1_quiet "Running pre-deploy steps"
|
dokku_col_log_info1_quiet "Running pre-deploy steps"
|
||||||
@ -172,7 +172,7 @@ dokku-ansible-deploy-post-deploy() {
|
|||||||
|
|
||||||
declare APP="$1"
|
declare APP="$1"
|
||||||
declare APP_DIR="$DOKKU_LIB_ROOT/data/deploy.d/$APP"
|
declare APP_DIR="$DOKKU_LIB_ROOT/data/deploy.d/$APP"
|
||||||
declare VAULT_FILE="$APP_DIR/.vault-password.sh"
|
declare VAULT_FILE="$APP_DIR/.vault.sh"
|
||||||
declare POST_DEPLOY="$PLUGIN_CORE_AVAILABLE_PATH/ansible-deploy/plays/post_deploy.yml"
|
declare POST_DEPLOY="$PLUGIN_CORE_AVAILABLE_PATH/ansible-deploy/plays/post_deploy.yml"
|
||||||
|
|
||||||
dokku_col_log_info1_quiet "Running post-deploy steps"
|
dokku_col_log_info1_quiet "Running post-deploy steps"
|
||||||
@ -202,7 +202,7 @@ dokku-ansible-deploy-post-delete() {
|
|||||||
|
|
||||||
declare APP="$1"
|
declare APP="$1"
|
||||||
declare APP_DIR="$DOKKU_LIB_ROOT/data/deploy.d/$APP"
|
declare APP_DIR="$DOKKU_LIB_ROOT/data/deploy.d/$APP"
|
||||||
declare VAULT_FILE="$APP_DIR/.vault-password.sh"
|
declare VAULT_FILE="$APP_DIR/.vault.sh"
|
||||||
declare POST_DELETE="$PLUGIN_CORE_AVAILABLE_PATH/ansible-deploy/plays/post_delete.yml"
|
declare POST_DELETE="$PLUGIN_CORE_AVAILABLE_PATH/ansible-deploy/plays/post_delete.yml"
|
||||||
|
|
||||||
dokku_col_log_info1_quiet "Running post-delete steps"
|
dokku_col_log_info1_quiet "Running post-delete steps"
|
||||||
|
Reference in New Issue
Block a user