|
@ -6,7 +6,7 @@ apache_proxy_dir () { |
|
|
err "You must specify a ${WHITE}domain$NORMAL option in relation." |
|
|
err "You must specify a ${WHITE}domain$NORMAL option in relation." |
|
|
return 1 |
|
|
return 1 |
|
|
} |
|
|
} |
|
|
proxy=yes apache_vhost_create |
|
|
|
|
|
|
|
|
proxy=yes apache_vhost_create || return 1 |
|
|
info "Added $DOMAIN as a proxy to $TARGET." |
|
|
info "Added $DOMAIN as a proxy to $TARGET." |
|
|
} |
|
|
} |
|
|
export -f apache_proxy_dir |
|
|
export -f apache_proxy_dir |
|
@ -40,7 +40,7 @@ apache_vhost_create () { |
|
|
|
|
|
|
|
|
__vhost_cfg_creds_enabled=$(relation-get creds 2>/dev/null) || true |
|
|
__vhost_cfg_creds_enabled=$(relation-get creds 2>/dev/null) || true |
|
|
if [ "$__vhost_cfg_creds_enabled" ]; then |
|
|
if [ "$__vhost_cfg_creds_enabled" ]; then |
|
|
apache_passwd_file |
|
|
|
|
|
|
|
|
apache_passwd_file || return 1 |
|
|
fi |
|
|
fi |
|
|
|
|
|
|
|
|
if is_protocol_enabled https; then |
|
|
if is_protocol_enabled https; then |
|
|