From fb83f84d844cf7f78c5146007eda24fd83d2ca1b Mon Sep 17 00:00:00 2001 From: wh1te909 Date: Tue, 6 Feb 2024 04:20:28 +0000 Subject: [PATCH 1/3] back to dev [skip ci] --- api/tacticalrmm/tacticalrmm/settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api/tacticalrmm/tacticalrmm/settings.py b/api/tacticalrmm/tacticalrmm/settings.py index a35d4a8591..ed839e4daf 100644 --- a/api/tacticalrmm/tacticalrmm/settings.py +++ b/api/tacticalrmm/tacticalrmm/settings.py @@ -20,7 +20,7 @@ AUTH_USER_MODEL = "accounts.User" # latest release -TRMM_VERSION = "0.17.4" +TRMM_VERSION = "0.17.5-dev" # https://github.com/amidaware/tacticalrmm-web WEB_VERSION = "0.101.40" From 94649cbfc7f4ce19f32bd844d780a6f98a502b8e Mon Sep 17 00:00:00 2001 From: wh1te909 Date: Tue, 6 Feb 2024 06:19:57 +0000 Subject: [PATCH 2/3] handle localhost bind issues on some instances --- api/tacticalrmm/core/tests.py | 4 ++-- api/tacticalrmm/tacticalrmm/helpers.py | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/api/tacticalrmm/core/tests.py b/api/tacticalrmm/core/tests.py index f60498d33c..985b00a267 100644 --- a/api/tacticalrmm/core/tests.py +++ b/api/tacticalrmm/core/tests.py @@ -449,7 +449,7 @@ def setUp(self): self.setup_coresettings() def test_standard_install(self): - self.assertEqual(get_nats_url(), "nats://localhost:4222") + self.assertEqual(get_nats_url(), "nats://127.0.0.1:4222") @override_settings( NATS_STANDARD_PORT=5000, @@ -469,7 +469,7 @@ def test_custom_connect_host_env(self): self.assertEqual(get_nats_url(), "nats://172.20.4.3:4222") def test_standard_nats_hosts(self): - self.assertEqual(get_nats_hosts(), ("localhost", "localhost", "localhost")) + self.assertEqual(get_nats_hosts(), ("127.0.0.1", "127.0.0.1", "127.0.0.1")) @override_settings(DOCKER_BUILD=True, ALLOWED_HOSTS=["api.example.com"]) def test_docker_nats_hosts(self): diff --git a/api/tacticalrmm/tacticalrmm/helpers.py b/api/tacticalrmm/tacticalrmm/helpers.py index c3d86fbc17..a54aecb56b 100644 --- a/api/tacticalrmm/tacticalrmm/helpers.py +++ b/api/tacticalrmm/tacticalrmm/helpers.py @@ -58,9 +58,9 @@ def get_nats_hosts() -> tuple[str, str, str]: # standard install if not settings.DOCKER_BUILD and not getattr(settings, "USE_NATS_STANDARD", False): std_bind_host, ws_bind_host, connect_host = ( - "localhost", - "localhost", - "localhost", + "127.0.0.1", + "127.0.0.1", + "127.0.0.1", ) # allow customizing all nats hosts From 4343478c7b26f76b1b4f83a80bbc6f09e31efde3 Mon Sep 17 00:00:00 2001 From: wh1te909 Date: Tue, 6 Feb 2024 06:41:51 +0000 Subject: [PATCH 3/3] bump version --- api/tacticalrmm/tacticalrmm/settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api/tacticalrmm/tacticalrmm/settings.py b/api/tacticalrmm/tacticalrmm/settings.py index ed839e4daf..20252ae8ea 100644 --- a/api/tacticalrmm/tacticalrmm/settings.py +++ b/api/tacticalrmm/tacticalrmm/settings.py @@ -20,7 +20,7 @@ AUTH_USER_MODEL = "accounts.User" # latest release -TRMM_VERSION = "0.17.5-dev" +TRMM_VERSION = "0.17.5" # https://github.com/amidaware/tacticalrmm-web WEB_VERSION = "0.101.40"