Release 0.13.3

amidaware · Apr 25, 2022 · e3a66f0 · e3a66f0
2 parents 0999d98 + 9e544ad
commit e3a66f0
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 11 deletions.
diff --git a/api/tacticalrmm/apiv3/views.py b/api/tacticalrmm/apiv3/views.py
@@ -182,7 +182,9 @@ def get(self, request, agentid):
         ret = {
             "agent": agent.pk,
             "check_interval": agent.check_interval,
-            "checks": CheckRunnerGetSerializer(checks, many=True).data,
+            "checks": CheckRunnerGetSerializer(
+                checks, context={"agent": agent}, many=True
+            ).data,
         }
         return Response(ret)
 
@@ -216,7 +218,9 @@ def get(self, request, agentid):
         ret = {
             "agent": agent.pk,
             "check_interval": agent.check_run_interval(),
-            "checks": CheckRunnerGetSerializer(run_list, many=True).data,
+            "checks": CheckRunnerGetSerializer(
+                run_list, context={"agent": agent}, many=True
+            ).data,
         }
         return Response(ret)
 

diff --git a/api/tacticalrmm/checks/serializers.py b/api/tacticalrmm/checks/serializers.py
@@ -159,8 +159,9 @@ def get_script_args(self, obj):
         if obj.check_type != "script":
             return []
 
+        agent = self.context["agent"] if "agent" in self.context.keys() else obj.agent
         return Script.parse_script_args(
-            agent=obj.agent, shell=obj.script.shell, args=obj.script_args
+            agent=agent, shell=obj.script.shell, args=obj.script_args
         )
 
     class Meta:

diff --git a/api/tacticalrmm/tacticalrmm/settings.py b/api/tacticalrmm/tacticalrmm/settings.py
@@ -17,7 +17,7 @@
 AUTH_USER_MODEL = "accounts.User"
 
 # latest release
-TRMM_VERSION = "0.13.2"
+TRMM_VERSION = "0.13.3"
 
 # bump this version everytime vue code is changed
 # to alert user they need to manually refresh their browser

diff --git a/docker/containers/tactical-meshcentral/entrypoint.sh b/docker/containers/tactical-meshcentral/entrypoint.sh
@@ -74,13 +74,6 @@ EOF
 )"
 
   echo "${mesh_config}" > /home/node/app/meshcentral-data/config.json
-
-else
-  # replace persistent mesh configuration with new ports
-  sed -i 's/"Port": 443/"Port": 4443/' /home/node/app/meshcentral-data/config.json
-  sed -i 's/"RedirPort": 80/"RedirPort": 8080/' /home/node/app/meshcentral-data/config.json
-  sed -i "s/\"CertUrl\": \".*\"/\"CertUrl\": \"https:\/\/${NGINX_HOST_IP}:${NGINX_HOST_PORT}\"/" /home/node/app/meshcentral-data/config.json
-
 fi
 
 node node_modules/meshcentral --createaccount ${MESH_USER} --pass ${MESH_PASS} --email example@example.com