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

Merge pull request #2485 from znz/fix-domains-add-global

Browse Source 
Fix bug when VHOST without newline
This commit is contained in:
Jose Diaz-Gonzalez
2016-11-21 22:10:10 -07:00
committed by GitHub
parent 334eabafb5 ccc44b0c16
commit 7cfbdf34ec
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/domains/functions
View File

@@ -148,7 +148,7 @@ domains_add_global() {
if [[ $(egrep -w "^$DOMAIN$" "$GLOBAL_VHOST_PATH" > /dev/null 2>&1; echo $?) -eq 0 ]]; then if [[ $(egrep -w "^$DOMAIN$" "$GLOBAL_VHOST_PATH" > /dev/null 2>&1; echo $?) -eq 0 ]]; then
dokku_log_info1 "Skipping: $DOMAIN already added" dokku_log_info1 "Skipping: $DOMAIN already added"
else else
echo "$DOMAIN" >> "$GLOBAL_VHOST_PATH" sed -i -e "\$a\\$DOMAIN" "$GLOBAL_VHOST_PATH"
dokku_log_info1 "Added $DOMAIN" dokku_log_info1 "Added $DOMAIN"
fi fi
done done

2
tests/unit/20_domains.bats
View File

@@ -170,7 +170,7 @@ teardown() {
echo "status: "$status echo "status: "$status
assert_success assert_success
run bash -c "dokku domains | grep -q global.dokku.me" run bash -c "dokku domains | egrep -qw '^global.dokku.me\$'"
echo "output: "$output echo "output: "$output
echo "status: "$status echo "status: "$status
assert_success assert_success