github/dokku
0
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix: Ensure VHOST files exist before executing commands against them

Browse Source 
Closes #2609
This commit is contained in:
Jose Diaz-Gonzalez
2017-02-19 19:57:09 -05:00
parent 618395df5e
commit 7c30babdec
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
plugins/domains/functions
View File

@@ -98,6 +98,7 @@ domains_remove() {
local APP="$1"; local APP_VHOST_PATH="$DOKKU_ROOT/$APP/VHOST" local APP="$1"; local APP_VHOST_PATH="$DOKKU_ROOT/$APP/VHOST"
shift 1 shift 1
touch "$APP_VHOST_PATH"
for DOMAIN in "$@"; do for DOMAIN in "$@"; do
sed -i "\|^$DOMAIN\$|d" "$APP_VHOST_PATH" sed -i "\|^$DOMAIN\$|d" "$APP_VHOST_PATH"
dokku_log_info1 "Removed $DOMAIN from $APP" dokku_log_info1 "Removed $DOMAIN from $APP"
@@ -111,6 +112,7 @@ domains_set() {
local APP="$1"; local APP_VHOST_PATH="$DOKKU_ROOT/$APP/VHOST" local APP="$1"; local APP_VHOST_PATH="$DOKKU_ROOT/$APP/VHOST"
shift 1 shift 1
touch "$APP_VHOST_PATH"
for DOMAIN in "$@"; do for DOMAIN in "$@"; do
if ! (is_valid_hostname "$DOMAIN"); then if ! (is_valid_hostname "$DOMAIN"); then
dokku_log_fail "$DOMAIN is invalid. exiting..." dokku_log_fail "$DOMAIN is invalid. exiting..."
@@ -132,6 +134,7 @@ domains_disable() {
verify_app_name "$1" verify_app_name "$1"
local APP="$1"; local APP_VHOST_PATH="$DOKKU_ROOT/$APP/VHOST" local APP="$1"; local APP_VHOST_PATH="$DOKKU_ROOT/$APP/VHOST"
touch "$APP_VHOST_PATH"
if [[ "$(is_app_vhost_enabled "$APP")" == "true" ]]; then if [[ "$(is_app_vhost_enabled "$APP")" == "true" ]]; then
disable_app_vhost "$APP" disable_app_vhost "$APP"
else else
@@ -145,6 +148,7 @@ domains_enable() {
local APP="$1"; local APP_VHOST_PATH="$DOKKU_ROOT/$APP/VHOST" local APP="$1"; local APP_VHOST_PATH="$DOKKU_ROOT/$APP/VHOST"
local DEFAULT_VHOSTS="$(get_default_vhosts "$APP")" local DEFAULT_VHOSTS="$(get_default_vhosts "$APP")"
touch "$APP_VHOST_PATH"
if [[ "$(is_app_vhost_enabled "$APP")" == "false" ]]; then if [[ "$(is_app_vhost_enabled "$APP")" == "false" ]]; then
if [[ -n "$DEFAULT_VHOSTS" ]]; then if [[ -n "$DEFAULT_VHOSTS" ]]; then
echo "$DEFAULT_VHOSTS" > "$APP_VHOST_PATH" echo "$DEFAULT_VHOSTS" > "$APP_VHOST_PATH"
@@ -160,6 +164,7 @@ domains_add_global() {
declare desc="add list of global domains" declare desc="add list of global domains"
local GLOBAL_VHOST_PATH="$DOKKU_ROOT/VHOST" local GLOBAL_VHOST_PATH="$DOKKU_ROOT/VHOST"
touch "$GLOBAL_VHOST_PATH"
for DOMAIN in "$@"; do for DOMAIN in "$@"; do
if ! (is_valid_hostname "$DOMAIN"); then if ! (is_valid_hostname "$DOMAIN"); then
dokku_log_fail "$DOMAIN is invalid. exiting..." dokku_log_fail "$DOMAIN is invalid. exiting..."
@@ -180,6 +185,7 @@ domains_remove_global() {
declare desc="remove list of domains" declare desc="remove list of domains"
local GLOBAL_VHOST_PATH="$DOKKU_ROOT/VHOST" local GLOBAL_VHOST_PATH="$DOKKU_ROOT/VHOST"
touch "$GLOBAL_VHOST_PATH"
for DOMAIN in "$@"; do for DOMAIN in "$@"; do
sed -i "\|^$DOMAIN\$|d" "$GLOBAL_VHOST_PATH" sed -i "\|^$DOMAIN\$|d" "$GLOBAL_VHOST_PATH"
dokku_log_info1 "Removed $DOMAIN" dokku_log_info1 "Removed $DOMAIN"
@@ -190,6 +196,7 @@ domains_set_global() {
declare desc="set list of global domains" declare desc="set list of global domains"
local GLOBAL_VHOST_PATH="$DOKKU_ROOT/VHOST" local GLOBAL_VHOST_PATH="$DOKKU_ROOT/VHOST"
touch "$GLOBAL_VHOST_PATH"
for DOMAIN in "$@"; do for DOMAIN in "$@"; do
if ! (is_valid_hostname "$DOMAIN"); then if ! (is_valid_hostname "$DOMAIN"); then
dokku_log_fail "$DOMAIN is invalid. exiting..." dokku_log_fail "$DOMAIN is invalid. exiting..."