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

fix: remove sites-enabled default instead of renaming

Browse Source 
Renaming `/etc/nginx/sites-enabled/default` to `.dokku-disabled` left a broken symlink that nginx's `include /etc/nginx/sites-enabled/*;` glob still picked up, breaking config validation. Files inside `sites-enabled/` are now removed; the real config in `sites-available/default` is still preserved via rename.
This commit is contained in:
Jose Diaz-Gonzalez
2026-04-27 04:02:18 -04:00
parent d7c88ae298
commit b2ea5406fe
2 changed files with 32 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tests/unit/nginx-vhosts_14.bats
View File

@@ -25,7 +25,6 @@ teardown() {
mv "${NGINX_DEFAULT_VHOST_PATH}.bats-bak" "$NGINX_DEFAULT_VHOST_PATH"
fi
rm -f /etc/nginx/sites-enabled/default.bats-stub
rm -f /etc/nginx/sites-enabled/default.bats-stub.dokku-disabled
[[ -f "$DOKKU_ROOT/VHOST.bak" ]] && mv "$DOKKU_ROOT/VHOST.bak" "$DOKKU_ROOT/VHOST" && chown dokku:dokku "$DOKKU_ROOT/VHOST"
if sudo nginx -t &>/dev/null; then
sudo systemctl reload nginx || true
@@ -90,7 +89,7 @@ STOCK
echo "status: $status"
assert_failure
sudo mv /etc/nginx/sites-enabled/default.bats-stub /etc/nginx/sites-enabled/default.bats-stub.dokku-disabled
sudo rm -f /etc/nginx/sites-enabled/default.bats-stub
run /bin/bash -c "sudo nginx -t"
echo "output: $output"