Ansible/monitored
1
0
Fork 0
Code Issues 6 Pull requests 3 Releases Wiki Activity

Ansible 2.x fixes

Browse source
This commit is contained in:
Sven Velt 2018-03-13 19:10:08 +01:00
parent f6fe7c2572
commit 8fb502c279
2 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
tasks/main.yml
View file

@ -14,14 +14,14 @@
- "{{ (ansible_os_family|lower).split(' ')[0] }}.yml" - "{{ (ansible_os_family|lower).split(' ')[0] }}.yml"
- "defaults.yml" - "defaults.yml"
- include: user.yml - import_tasks: user.yml
- include: packages.yml - include_tasks: packages.yml
when: monitored_packages_install != False when: monitored_packages_install != False
- include: nrpe.yml - include_tasks: nrpe.yml
when: monitored_by_nrpe == True when: monitored_by_nrpe == True
- include: ssh.yml - include_tasks: ssh.yml
when: monitored_by_ssh == True when: monitored_by_ssh == True

5
tasks/ssh.yml
View file

@ -12,12 +12,13 @@
user: "{{ monitored_user }}" user: "{{ monitored_user }}"
key: "{{ lookup('file', item) }}" key: "{{ lookup('file', item) }}"
key_options: 'no-agent-forwarding,no-port-forwarding,no-X11-forwarding,no-pty{% if monitored_ssh_key_wrapper %},command="{{ monitored_ssh_key_wrapper }}"{% endif %}' key_options: 'no-agent-forwarding,no-port-forwarding,no-X11-forwarding,no-pty{% if monitored_ssh_key_wrapper %},command="{{ monitored_ssh_key_wrapper }}"{% endif %}'
with_items: monitored_ssh_key_files with_items: "{{ monitored_ssh_key_files }}"
- name: Copy SSH wrapper - name: Copy SSH wrapper
copy: copy:
src: "{{ monitored_ssh_key_wrapper_src }}" src: "{{ monitored_ssh_key_wrapper_src }}"
path: "{{ monitored_ssh_key_wrapper }}" path: "{{ monitored_ssh_key_wrapper }}"
mode: 0755 mode: 0755
when: monitored_ssh_key_wrapper_src backup: yes
when: monitored_ssh_key_wrapper_src|default(null)