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

fix: mysql 开启ssl 再关闭 测试可连接性失败

pull/12169/head
feng 2023-11-20 10:45:36 +08:00 committed by 老广
parent 07e1918fa1
commit 2edcb2f2d3
6 changed files with 46 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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

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

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

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

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

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

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

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

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