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

fix: mysql 开始ssl后 再关闭测试失败

pull/12210/head
feng 2023-11-20 15:27:51 +08:00 committed by Bryan
parent 4c389c05c1
commit 73bed4d33d
6 changed files with 46 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
apps/accounts/automations/change_secret/database/mysql/main.yml
View File

@ -3,7 +3,7 @@
vars:
ansible_python_interpreter: /opt/py3/bin/python
db_name: "{{ jms_asset.spec_info.db_name }}"
jms_use_ssl: "{{ jms_asset.spec_info.use_ssl }}"
check_ssl: "{{ jms_asset.spec_info.use_ssl and not jms_asset.spec_info.allow_invalid_cert }}"
tasks:
- name: Test MySQL connection
@ -12,10 +12,10 @@
login_password: "{{ jms_account.secret }}"
login_host: "{{ jms_asset.address }}"
login_port: "{{ jms_asset.port }}"
check_hostname: "{{ omit if not jms_use_ssl else jms_asset.spec_info.allow_invalid_cert }}"
ca_cert: "{{ omit if not jms_use_ssl else jms_asset.secret_info.ca_cert }}"
client_cert: "{{ omit if not jms_use_ssl else jms_asset.secret_info.client_cert }}"
client_key: "{{ omit if not jms_use_ssl else jms_asset.secret_info.client_key }}"
check_hostname: "{{ check_ssl if check_ssl else omit }}"
ca_cert: "{{ jms_asset.secret_info.ca_cert | default(omit) if check_ssl else omit }}"
client_cert: "{{ jms_asset.secret_info.client_cert | default(omit) if check_ssl else omit }}"
client_key: "{{ jms_asset.secret_info.client_key | default(omit) if check_ssl else omit }}"
filter: version
register: db_info
@ -29,10 +29,10 @@
login_password: "{{ jms_account.secret }}"
login_host: "{{ jms_asset.address }}"
login_port: "{{ jms_asset.port }}"
check_hostname: "{{ omit if not jms_use_ssl else jms_asset.spec_info.allow_invalid_cert }}"
ca_cert: "{{ omit if not jms_use_ssl else jms_asset.secret_info.ca_cert }}"
client_cert: "{{ omit if not jms_use_ssl else jms_asset.secret_info.client_cert }}"
client_key: "{{ omit if not jms_use_ssl else jms_asset.secret_info.client_key }}"
check_hostname: "{{ check_ssl if check_ssl else omit }}"
ca_cert: "{{ jms_asset.secret_info.ca_cert | default(omit) if check_ssl else omit }}"
client_cert: "{{ jms_asset.secret_info.client_cert | default(omit) if check_ssl else omit }}"
client_key: "{{ jms_asset.secret_info.client_key | default(omit) if check_ssl else omit }}"
name: "{{ account.username }}"
password: "{{ account.secret }}"
host: "%"
@ -46,8 +46,8 @@
login_password: "{{ account.secret }}"
login_host: "{{ jms_asset.address }}"
login_port: "{{ jms_asset.port }}"
check_hostname: "{{ omit if not jms_use_ssl else jms_asset.spec_info.allow_invalid_cert }}"
ca_cert: "{{ omit if not jms_use_ssl else jms_asset.secret_info.ca_cert }}"
client_cert: "{{ omit if not jms_use_ssl else jms_asset.secret_info.client_cert }}"
client_key: "{{ omit if not jms_use_ssl else jms_asset.secret_info.client_key }}"
check_hostname: "{{ check_ssl if check_ssl else omit }}"
ca_cert: "{{ jms_asset.secret_info.ca_cert | default(omit) if check_ssl else omit }}"
client_cert: "{{ jms_asset.secret_info.client_cert | default(omit) if check_ssl else omit }}"
client_key: "{{ jms_asset.secret_info.client_key | default(omit) if check_ssl else omit }}"
filter: version

10
apps/accounts/automations/gather_accounts/database/mysql/main.yml
View File

@ -2,7 +2,7 @@
gather_facts: no
vars:
ansible_python_interpreter: /opt/py3/bin/python
jms_use_ssl: "{{ jms_asset.spec_info.use_ssl }}"
check_ssl: "{{ jms_asset.spec_info.use_ssl and not jms_asset.spec_info.allow_invalid_cert }}"
tasks:
- name: Get info
@ -11,10 +11,10 @@
login_password: "{{ jms_account.secret }}"
login_host: "{{ jms_asset.address }}"
login_port: "{{ jms_asset.port }}"
check_hostname: "{{ omit if not jms_use_ssl else jms_asset.spec_info.allow_invalid_cert }}"
ca_cert: "{{ omit if not jms_use_ssl else jms_asset.secret_info.ca_cert }}"
client_cert: "{{ omit if not jms_use_ssl else jms_asset.secret_info.client_cert }}"
client_key: "{{ omit if not jms_use_ssl else jms_asset.secret_info.client_key }}"
check_hostname: "{{ check_ssl if check_ssl else omit }}"
ca_cert: "{{ jms_asset.secret_info.ca_cert | default(omit) if check_ssl else omit }}"
client_cert: "{{ jms_asset.secret_info.client_cert | default(omit) if check_ssl else omit }}"
client_key: "{{ jms_asset.secret_info.client_key | default(omit) if check_ssl else omit }}"
filter: users
register: db_info

26
apps/accounts/automations/push_account/database/mysql/main.yml
View File

@ -3,7 +3,7 @@
vars:
ansible_python_interpreter: /opt/py3/bin/python
db_name: "{{ jms_asset.spec_info.db_name }}"
jms_use_ssl: "{{ jms_asset.spec_info.use_ssl }}"
check_ssl: "{{ jms_asset.spec_info.use_ssl and not jms_asset.spec_info.allow_invalid_cert }}"
tasks:
- name: Test MySQL connection
@ -12,10 +12,10 @@
login_password: "{{ jms_account.secret }}"
login_host: "{{ jms_asset.address }}"
login_port: "{{ jms_asset.port }}"
check_hostname: "{{ omit if not jms_use_ssl else jms_asset.spec_info.allow_invalid_cert }}"
ca_cert: "{{ omit if not jms_use_ssl else jms_asset.secret_info.ca_cert }}"
client_cert: "{{ omit if not jms_use_ssl else jms_asset.secret_info.client_cert }}"
client_key: "{{ omit if not jms_use_ssl else jms_asset.secret_info.client_key }}"
check_hostname: "{{ check_ssl if check_ssl else omit }}"
ca_cert: "{{ jms_asset.secret_info.ca_cert | default(omit) if check_ssl else omit }}"
client_cert: "{{ jms_asset.secret_info.client_cert | default(omit) if check_ssl else omit }}"
client_key: "{{ jms_asset.secret_info.client_key | default(omit) if check_ssl else omit }}"
filter: version
register: db_info
@ -29,10 +29,10 @@
login_password: "{{ jms_account.secret }}"
login_host: "{{ jms_asset.address }}"
login_port: "{{ jms_asset.port }}"
check_hostname: "{{ omit if not jms_use_ssl else jms_asset.spec_info.allow_invalid_cert }}"
ca_cert: "{{ omit if not jms_use_ssl else jms_asset.secret_info.ca_cert }}"
client_cert: "{{ omit if not jms_use_ssl else jms_asset.secret_info.client_cert }}"
client_key: "{{ omit if not jms_use_ssl else jms_asset.secret_info.client_key }}"
check_hostname: "{{ check_ssl if check_ssl else omit }}"
ca_cert: "{{ jms_asset.secret_info.ca_cert | default(omit) if check_ssl else omit }}"
client_cert: "{{ jms_asset.secret_info.client_cert | default(omit) if check_ssl else omit }}"
client_key: "{{ jms_asset.secret_info.client_key | default(omit) if check_ssl else omit }}"
name: "{{ account.username }}"
password: "{{ account.secret }}"
host: "%"
@ -46,8 +46,8 @@
login_password: "{{ account.secret }}"
login_host: "{{ jms_asset.address }}"
login_port: "{{ jms_asset.port }}"
check_hostname: "{{ omit if not jms_use_ssl else jms_asset.spec_info.allow_invalid_cert }}"
ca_cert: "{{ omit if not jms_use_ssl else jms_asset.secret_info.ca_cert }}"
client_cert: "{{ omit if not jms_use_ssl else jms_asset.secret_info.client_cert }}"
client_key: "{{ omit if not jms_use_ssl else jms_asset.secret_info.client_key }}"
check_hostname: "{{ check_ssl if check_ssl else omit }}"
ca_cert: "{{ jms_asset.secret_info.ca_cert | default(omit) if check_ssl else omit }}"
client_cert: "{{ jms_asset.secret_info.client_cert | default(omit) if check_ssl else omit }}"
client_key: "{{ jms_asset.secret_info.client_key | default(omit) if check_ssl else omit }}"
filter: version

10
apps/accounts/automations/verify_account/database/mysql/main.yml
View File

@ -2,7 +2,7 @@
gather_facts: no
vars:
ansible_python_interpreter: /opt/py3/bin/python
jms_use_ssl: "{{ jms_asset.spec_info.use_ssl }}"
check_ssl: "{{ jms_asset.spec_info.use_ssl and not jms_asset.spec_info.allow_invalid_cert }}"
tasks:
- name: Verify account
@ -11,8 +11,8 @@
login_password: "{{ account.secret }}"
login_host: "{{ jms_asset.address }}"
login_port: "{{ jms_asset.port }}"
check_hostname: "{{ omit if not jms_use_ssl else jms_asset.spec_info.allow_invalid_cert }}"
ca_cert: "{{ omit if not jms_use_ssl else jms_asset.secret_info.ca_cert }}"
client_cert: "{{ omit if not jms_use_ssl else jms_asset.secret_info.client_cert }}"
client_key: "{{ omit if not jms_use_ssl else jms_asset.secret_info.client_key }}"
check_hostname: "{{ check_ssl if check_ssl else omit }}"
ca_cert: "{{ jms_asset.secret_info.ca_cert | default(omit) if check_ssl else omit }}"
client_cert: "{{ jms_asset.secret_info.client_cert | default(omit) if check_ssl else omit }}"
client_key: "{{ jms_asset.secret_info.client_key | default(omit) if check_ssl else omit }}"
filter: version

10
apps/assets/automations/gather_facts/database/mysql/main.yml
View File

@ -2,7 +2,7 @@
gather_facts: no
vars:
ansible_python_interpreter: /opt/py3/bin/python
jms_use_ssl: "{{ jms_asset.spec_info.use_ssl }}"
check_ssl: "{{ jms_asset.spec_info.use_ssl and not jms_asset.spec_info.allow_invalid_cert }}"
tasks:
- name: Get info
@ -11,10 +11,10 @@
login_password: "{{ jms_account.secret }}"
login_host: "{{ jms_asset.address }}"
login_port: "{{ jms_asset.port }}"
check_hostname: "{{ omit if not jms_use_ssl else jms_asset.spec_info.allow_invalid_cert }}"
ca_cert: "{{ omit if not jms_use_ssl else jms_asset.secret_info.ca_cert }}"
client_cert: "{{ omit if not jms_use_ssl else jms_asset.secret_info.client_cert }}"
client_key: "{{ omit if not jms_use_ssl else jms_asset.secret_info.client_key }}"
check_hostname: "{{ check_ssl if check_ssl else omit }}"
ca_cert: "{{ jms_asset.secret_info.ca_cert | default(omit) if check_ssl else omit }}"
client_cert: "{{ jms_asset.secret_info.client_cert | default(omit) if check_ssl else omit }}"
client_key: "{{ jms_asset.secret_info.client_key | default(omit) if check_ssl else omit }}"
filter: version
register: db_info

10
apps/assets/automations/ping/database/mysql/main.yml
View File

@ -2,7 +2,7 @@
gather_facts: no
vars:
ansible_python_interpreter: /opt/py3/bin/python
jms_use_ssl: "{{ jms_asset.spec_info.use_ssl }}"
check_ssl: "{{ jms_asset.spec_info.use_ssl and not jms_asset.spec_info.allow_invalid_cert }}"
tasks:
- name: Test MySQL connection
@ -11,8 +11,8 @@
login_password: "{{ jms_account.secret }}"
login_host: "{{ jms_asset.address }}"
login_port: "{{ jms_asset.port }}"
check_hostname: "{{ omit if not jms_use_ssl else jms_asset.spec_info.allow_invalid_cert }}"
ca_cert: "{{ omit if not jms_use_ssl else jms_asset.secret_info.ca_cert }}"
client_cert: "{{ omit if not jms_use_ssl else jms_asset.secret_info.client_cert }}"
client_key: "{{ omit if not jms_use_ssl else jms_asset.secret_info.client_key }}"
check_hostname: "{{ check_ssl if check_ssl else omit }}"
ca_cert: "{{ jms_asset.secret_info.ca_cert | default(omit) if check_ssl else omit }}"
client_cert: "{{ jms_asset.secret_info.client_cert | default(omit) if check_ssl else omit }}"
client_key: "{{ jms_asset.secret_info.client_key | default(omit) if check_ssl else omit }}"
filter: version