From a577c2392758fc9509a73b332ce1795638b2510b Mon Sep 17 00:00:00 2001
From: Olivier Leger <olivierleger@gmail.com>
Date: Wed, 10 Jun 2020 21:36:24 -0300
Subject: [PATCH 1/2] Save reverse proxy option bugfix

---
 helpers/config.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/helpers/config.py b/helpers/config.py
index 1c45e7f..027af0a 100644
--- a/helpers/config.py
+++ b/helpers/config.py
@@ -1347,7 +1347,6 @@ def __questions_reverse_proxy(self):
             self.__config["use_letsencrypt"] = CLI.get_response([Config.TRUE, Config.FALSE],
                                                                 self.__config.get("use_letsencrypt", Config.TRUE))
             self.__config["proxy"] = Config.TRUE
-            self.__config["block_common_http_ports"] = Config.TRUE
             self.__config["exposed_nginx_docker_port"] = Config.DEFAULT_NGINX_PORT
 
             if self.use_letsencrypt:
@@ -1397,6 +1396,12 @@ def __questions_reverse_proxy(self):
                     self.__config["block_common_http_ports"] = CLI.get_response(
                         [Config.TRUE, Config.FALSE],
                         self.__config.get("block_common_http_ports", Config.FALSE))
+                else:
+                    self.__config["block_common_http_ports"] = Config.TRUE
+
+                if not self.__is_port_allowed(self.__config["nginx_proxy_port"]):
+                    # Force nginx proxy port if port is not allowed
+                    self.__config["nginx_proxy_port"] = Config.DEFAULT_PROXY_PORT
 
                 CLI.colored_print("Internal port used by reverse proxy?", CLI.COLOR_SUCCESS)
                 while True:
@@ -1407,6 +1412,7 @@ def __questions_reverse_proxy(self):
                     else:
                         CLI.colored_print("Ports 80 and 443 are reserved!", CLI.COLOR_ERROR)
             else:
+                self.__config["block_common_http_ports"] = Config.TRUE
                 if not self.use_letsencrypt:
                     CLI.colored_print("Internal port used by reverse proxy is {}.".format(
                         Config.DEFAULT_PROXY_PORT

From a8878a21c86bd8a8caaa0c0ca46b8451f7e200b3 Mon Sep 17 00:00:00 2001
From: Olivier Leger <olivierleger@gmail.com>
Date: Wed, 10 Jun 2020 21:39:29 -0300
Subject: [PATCH 2/2] Bumped version to 2.4.2

---
 helpers/config.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/helpers/config.py b/helpers/config.py
index 027af0a..2d4e3ef 100644
--- a/helpers/config.py
+++ b/helpers/config.py
@@ -30,7 +30,7 @@ class Config:
     DEFAULT_NGINX_HTTPS_PORT = "443"
     KOBO_DOCKER_BRANCH = '2.020.24'
     KOBO_INSTALL_BRANCH = 'master'
-    KOBO_INSTALL_VERSION = '2.3.0'
+    KOBO_INSTALL_VERSION = '2.4.2'
 
     # Maybe overkill. Use this class as a singleton to get the same configuration
     # for each instantiation.