github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #9880 from jumpserver/pr@dev@perf_applet_certs 

fix: 修复自签证书下发布机部署失败
pull/9883/head
老广 2023-03-08 14:04:47 +08:00 committed by GitHub
parent 261ec60ab7 7d6295775f
commit c8c33c02ef
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
apps/terminal/automations/deploy_applet_host/playbook.yml
View File

@ -3,6 +3,7 @@
- hosts: all - hosts: all
vars: vars:
APPLET_DOWNLOAD_HOST: https://demo.jumpserver.org APPLET_DOWNLOAD_HOST: https://demo.jumpserver.org
IGNORE_VERIFY_CERTS: true
HOST_NAME: test HOST_NAME: test
HOST_ID: 00000000-0000-0000-0000-000000000000 HOST_ID: 00000000-0000-0000-0000-000000000000
CORE_HOST: https://demo.jumpserver.org CORE_HOST: https://demo.jumpserver.org
@ -37,6 +38,7 @@
ansible.windows.win_get_url: ansible.windows.win_get_url:
url: "{{ APPLET_DOWNLOAD_HOST }}/download/applets/{{ TinkerInstaller }}" url: "{{ APPLET_DOWNLOAD_HOST }}/download/applets/{{ TinkerInstaller }}"
dest: "{{ ansible_env.TEMP }}\\{{ TinkerInstaller }}" dest: "{{ ansible_env.TEMP }}\\{{ TinkerInstaller }}"
validate_certs: "{{ IGNORE_VERIFY_CERTS }}"
- name: Install JumpServer Tinker (jumpserver) - name: Install JumpServer Tinker (jumpserver)
ansible.windows.win_package: ansible.windows.win_package:
@ -57,6 +59,7 @@
ansible.windows.win_get_url: ansible.windows.win_get_url:
url: "{{ APPLET_DOWNLOAD_HOST }}/download/applets/python-3.10.8-amd64.exe" url: "{{ APPLET_DOWNLOAD_HOST }}/download/applets/python-3.10.8-amd64.exe"
dest: "{{ ansible_env.TEMP }}\\python-3.10.8-amd64.exe" dest: "{{ ansible_env.TEMP }}\\python-3.10.8-amd64.exe"
validate_certs: "{{ IGNORE_VERIFY_CERTS }}"
- name: Install the python-3.10.8 - name: Install the python-3.10.8
ansible.windows.win_package: ansible.windows.win_package:
@ -132,6 +135,7 @@
ansible.windows.win_get_url: ansible.windows.win_get_url:
url: "{{ APPLET_DOWNLOAD_HOST }}/download/applets/pip_packages.zip" url: "{{ APPLET_DOWNLOAD_HOST }}/download/applets/pip_packages.zip"
dest: "{{ ansible_env.TEMP }}\\pip_packages.zip" dest: "{{ ansible_env.TEMP }}\\pip_packages.zip"
validate_certs: "{{ IGNORE_VERIFY_CERTS }}"
- name: Unzip pip_packages - name: Unzip pip_packages
community.windows.win_unzip: community.windows.win_unzip:
@ -147,6 +151,7 @@
ansible.windows.win_get_url: ansible.windows.win_get_url:
url: "{{ APPLET_DOWNLOAD_HOST }}/download/applets/chromedriver_win32.zip" url: "{{ APPLET_DOWNLOAD_HOST }}/download/applets/chromedriver_win32.zip"
dest: "{{ ansible_env.TEMP }}\\chromedriver_win32.zip" dest: "{{ ansible_env.TEMP }}\\chromedriver_win32.zip"
validate_certs: "{{ IGNORE_VERIFY_CERTS }}"
- name: Unzip chromedriver (Chromium) - name: Unzip chromedriver (Chromium)
community.windows.win_unzip: community.windows.win_unzip:
@ -157,6 +162,7 @@
ansible.windows.win_get_url: ansible.windows.win_get_url:
url: "{{ APPLET_DOWNLOAD_HOST }}/download/applets/chrome-win.zip" url: "{{ APPLET_DOWNLOAD_HOST }}/download/applets/chrome-win.zip"
dest: "{{ ansible_env.TEMP }}\\chrome-win.zip" dest: "{{ ansible_env.TEMP }}\\chrome-win.zip"
validate_certs: "{{ IGNORE_VERIFY_CERTS }}"
- name: Unzip Chromium (Chromium) - name: Unzip Chromium (Chromium)
community.windows.win_unzip: community.windows.win_unzip:
@ -181,6 +187,7 @@
ansible.windows.win_get_url: ansible.windows.win_get_url:
url: "{{ APPLET_DOWNLOAD_HOST }}/download/applets/navicat161_premium_en_x64.exe" url: "{{ APPLET_DOWNLOAD_HOST }}/download/applets/navicat161_premium_en_x64.exe"
dest: "{{ ansible_env.TEMP }}\\navicat161_premium_en_x64.exe" dest: "{{ ansible_env.TEMP }}\\navicat161_premium_en_x64.exe"
validate_certs: "{{ IGNORE_VERIFY_CERTS }}"
- name: Install navicat (navicat) - name: Install navicat (navicat)
ansible.windows.win_package: ansible.windows.win_package:

1
apps/terminal/serializers/applet_host.py
View File

@ -39,6 +39,7 @@ class DeployOptionsSerializer(serializers.Serializer):
eg: https://172.16.10.110 or https://dev.jumpserver.com 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")) RDS_Licensing = serializers.BooleanField(default=False, label=_("Existing RDS license"))
RDS_LicenseServer = serializers.CharField(default='127.0.0.1', label=_('RDS License Server'), max_length=1024) RDS_LicenseServer = serializers.CharField(default='127.0.0.1', label=_('RDS License Server'), max_length=1024)
RDS_LicensingMode = serializers.ChoiceField(choices=LICENSE_MODE_CHOICES, default=2, label=_('RDS Licensing Mode')) RDS_LicensingMode = serializers.ChoiceField(choices=LICENSE_MODE_CHOICES, default=2, label=_('RDS Licensing Mode'))