From ec9084c7ce68c0efea55b3284bd140ea8c719f28 Mon Sep 17 00:00:00 2001
From: Aidaho <aidaho@roxy-wi.org>
Date: Sat, 16 Dec 2023 11:50:35 +0300
Subject: [PATCH] v7.1.0.0

Changelog: https://roxy-wi.org/changelog#7.1.0
---
 app/__init__.py                     |  3 ++-
 app/modules/service/installation.py |  2 +-
 app/routes/install/routes.py        | 14 +++++++-------
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/app/__init__.py b/app/__init__.py
index 661cabd2..cb244acd 100644
--- a/app/__init__.py
+++ b/app/__init__.py
@@ -18,7 +18,6 @@ scheduler.start()
 login_manager = LoginManager(app)
 login_manager.login_view = 'login_page'
 
-
 from app.routes.main import bp as main_bp
 from app.routes.overview import bp as overview_bp
 from app.routes.add import bp as add_bp
@@ -35,6 +34,7 @@ from app.routes.install import bp as install_bp
 from app.routes.user import bp as user_bp
 from app.routes.server import bp as server_bp
 from app.routes.admin import bp as admin_bp
+from app.routes.ha import bp as ha_bp
 
 app.register_blueprint(main_bp)
 app.register_blueprint(overview_bp)
@@ -52,6 +52,7 @@ app.register_blueprint(install_bp, url_prefix='/install')
 app.register_blueprint(user_bp, url_prefix='/user')
 app.register_blueprint(server_bp, url_prefix='/server')
 app.register_blueprint(admin_bp, url_prefix='/admin')
+app.register_blueprint(ha_bp, url_prefix='/ha')
 
 from app import login
 from app import jobs
diff --git a/app/modules/service/installation.py b/app/modules/service/installation.py
index 5ebdada6..ab8c0ec3 100644
--- a/app/modules/service/installation.py
+++ b/app/modules/service/installation.py
@@ -13,7 +13,7 @@ from modules.server.ssh import return_ssh_keys_path
 
 
 def show_installation_output(error: str, output: str, service: str, rc=0):
-	if error.read() and "WARNING" not in error.read():
+	if error and "WARNING" not in error:
 		roxywi_common.logging('Roxy-WI server', error, roxywi=1)
 		raise Exception('error: ' + error)
 	else:
diff --git a/app/routes/install/routes.py b/app/routes/install/routes.py
index 45847376..fe1ba360 100644
--- a/app/routes/install/routes.py
+++ b/app/routes/install/routes.py
@@ -3,13 +3,13 @@ from flask_login import login_required
 
 from app.routes.install import bp
 from middleware import get_user_params, check_services
-import app.modules.db.sql as sql
-import app.modules.common.common as common
-import app.modules.roxywi.auth as roxywi_auth
-import app.modules.server.server as server_mod
-import app.modules.service.common as service_common
-import app.modules.service.installation as service_mod
-import app.modules.service.exporter_installation as exp_installation
+import modules.db.sql as sql
+import modules.common.common as common
+import modules.roxywi.auth as roxywi_auth
+import modules.server.server as server_mod
+import modules.service.common as service_common
+import modules.service.installation as service_mod
+import modules.service.exporter_installation as exp_installation
 
 
 @bp.before_request