Fix migration from EE with custom nginx-ee

2019-08-23 17:11:43 +02:00
parent d6cd58922a
commit 2defb346e3
3 changed files with 20 additions and 7 deletions
--- a/2
+++ b/2
@@ -494,6 +494,7 @@ wo_upgrade_nginx() {
        # install new nginx package
        if [ -n "$CHECK_NGINX_EE" ]; then
            if [ -x /usr/local/bin/wo ]; then
+                [ -f /etc/apt/preferences.d/nginx-block ] && { mv /etc/apt/preferences.d/nginx-block .;}
                # stop nginx
                service nginx stop
                # remove previous package
@@ -544,6 +545,7 @@ wo_upgrade_nginx() {
            systemctl stop nginx
            systemctl start nginx
        fi
+        [ -f ./nginx-block ] && { mv nginx-block /etc/apt/preferences.d/nginx-block ;}

    } \
        >> "$wo_install_log" 2>&1