From 17ec105f69b6a3406805e8a3c345c691468d8317 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=B4=E5=B0=8F=E7=99=BD?= <296015668@qq.com>
Date: Wed, 8 Mar 2023 13:40:55 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20=E4=BF=AE=E6=AD=A3=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../automations/deploy_applet_host/playbook.yml | 2 +-
apps/terminal/serializers/applet_host.py | 14 +++++++-------
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/apps/terminal/automations/deploy_applet_host/playbook.yml b/apps/terminal/automations/deploy_applet_host/playbook.yml
index 70bbc03d6..9d67ed746 100644
--- a/apps/terminal/automations/deploy_applet_host/playbook.yml
+++ b/apps/terminal/automations/deploy_applet_host/playbook.yml
@@ -198,7 +198,7 @@
- name: Generate tinkerd component config
ansible.windows.win_shell:
- "tinkerd config --hostname '{{ HOST_NAME }}'' --core_host {{ CORE_HOST }}
+ "tinkerd config --hostname {{ HOST_NAME }} --core_host {{ CORE_HOST }}
--token {{ BOOTSTRAP_TOKEN }} --host_id {{ HOST_ID }}"
- name: Install tinkerd service
diff --git a/apps/terminal/serializers/applet_host.py b/apps/terminal/serializers/applet_host.py
index a10c669d2..e22df0bf6 100644
--- a/apps/terminal/serializers/applet_host.py
+++ b/apps/terminal/serializers/applet_host.py
@@ -31,13 +31,13 @@ class DeployOptionsSerializer(serializers.Serializer):
CORE_HOST = serializers.CharField(
default=settings.SITE_URL, label=_('Core API'), max_length=1024,
- help_text=_("""
- Tips: The application release machine communicates with the Core service.
- If the release machine and the Core service are on the same network segment,
- it is recommended to fill in the intranet address, otherwise fill in the current site URL
-
- eg: https://172.16.10.110 or https://dev.jumpserver.com
- """)
+ help_text=_("""
+ Tips: The application release machine communicates with the Core service.
+ If the release machine and the Core service are on the same network segment,
+ it is recommended to fill in the intranet address, otherwise fill in the current site URL
+
+ eg: https://172.16.10.110 or https://dev.jumpserver.com
+ """)
)
IGNORE_VERIFY_CERTS = serializers.BooleanField(default=True, label=_("Ignore Certificate Verification"))
RDS_Licensing = serializers.BooleanField(default=False, label=_("Existing RDS license"))