From 5e9306ad405136a47a867be6ef35b74eb751c85f Mon Sep 17 00:00:00 2001 From: Andrea Rabbaglietti Date: Mon, 2 Oct 2017 17:37:17 +0200 Subject: [PATCH 1/3] Fix #2927 Fix to prevent dokku upgrade on debian systems overwrites ${DOKKU_ROOT}/VHOST --- debian/postinst | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/debian/postinst b/debian/postinst index e6a1f2412..f43db7b10 100755 --- a/debian/postinst +++ b/debian/postinst @@ -100,14 +100,16 @@ case "$1" in exit 0 fi - db_get "dokku/vhost_enable" - if [ "$RET" = "true" ]; then - db_get "dokku/hostname" - echo "$RET" > "${DOKKU_ROOT}/VHOST" - else - rm -f "${DOKKU_ROOT}/VHOST" + if [ ! -f "${DOKKU_ROOT}/VHOST" ]; then + db_get "dokku/vhost_enable" + if [ "$RET" = "true" ]; then + db_get "dokku/hostname" + echo "$RET" > "${DOKKU_ROOT}/VHOST" + else + rm -f "${DOKKU_ROOT}/VHOST" + fi fi - + db_get "dokku/hostname" echo "$RET" > "${DOKKU_ROOT}/HOSTNAME" From f664ad1cdeb00812b28c987692a7e7edf2cff609 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Mon, 2 Oct 2017 11:40:31 -0400 Subject: [PATCH 2/3] fix: remove extra whitespace --- debian/postinst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/postinst b/debian/postinst index f43db7b10..7b4d68054 100755 --- a/debian/postinst +++ b/debian/postinst @@ -109,7 +109,7 @@ case "$1" in rm -f "${DOKKU_ROOT}/VHOST" fi fi - + db_get "dokku/hostname" echo "$RET" > "${DOKKU_ROOT}/HOSTNAME" From 093414b846a269570b35f6dd6291f54b1085cb69 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Mon, 2 Oct 2017 11:48:29 -0400 Subject: [PATCH 3/3] feat: add logging --- debian/postinst | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/debian/postinst b/debian/postinst index 7b4d68054..5f4643b4d 100755 --- a/debian/postinst +++ b/debian/postinst @@ -100,12 +100,16 @@ case "$1" in exit 0 fi - if [ ! -f "${DOKKU_ROOT}/VHOST" ]; then + if [ -f "${DOKKU_ROOT}/VHOST" ]; then + echo "VHOST file detected, skipping modification" + else db_get "dokku/vhost_enable" if [ "$RET" = "true" ]; then db_get "dokku/hostname" + echo "Setting VHOST contents to $RET" echo "$RET" > "${DOKKU_ROOT}/VHOST" else + echo "VHOST disabled via debconf, removing" rm -f "${DOKKU_ROOT}/VHOST" fi fi