tpiccioli
/
ansible-roles
forked from ISTI-ansible-roles/ansible-roles
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request 'Use the remote letsencrypt role.' (#202) from adellam/ansible-roles:master into master

This commit is contained in:
Andrea Dell'Amico 2020-05-19 17:07:08 +02:00
parent 85a4d28d47 51ff938a01
commit f332a127a9
2 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
library/bootstrap-roles/centos-common/meta/main.yml
View File

@ -9,9 +9,6 @@ dependencies:
- role: '../../library/centos/roles/firewalld' - role: '../../library/centos/roles/firewalld'
- role: '../../library/centos/roles/fail2ban' - role: '../../library/centos/roles/fail2ban'
- { role: '../../library/roles/cloud-init', when: ansible_product_name == "oVirt Node" } - { role: '../../library/roles/cloud-init', when: ansible_product_name == "oVirt Node" }
- { role: '../../library/roles/letsencrypt-acme-sh-client', when: letsencrypt_acme_sh_install is defined and letsencrypt_acme_sh_install } - { role: 'letsencrypt-acme-sh-client', when: letsencrypt_acme_sh_install is defined and letsencrypt_acme_sh_install }
- { role: 'zabbix-agent', when: zabbix_agent_install is defined and zabbix_agent_install }
- { role: '../../library/centos/roles/prometheus-node-exporter', when: prometheus_enabled } - { role: '../../library/centos/roles/prometheus-node-exporter', when: prometheus_enabled }
- src: git+https://gitea-s2i2s.isti.cnr.it/ISTI-ansible-roles/ansible-role-zabbix-agent.git
version: master
name: zabbix-agent
when: zabbix_agent_install | bool

9
library/bootstrap-roles/deb-ubuntu-common/meta/main.yml
View File

@ -7,11 +7,6 @@ dependencies:
- role: '../../library/roles/iptables' - role: '../../library/roles/iptables'
- { role: '../../library/roles/data_disk', when: additional_disks is defined and additional_disks } - { role: '../../library/roles/data_disk', when: additional_disks is defined and additional_disks }
- role: '../../library/roles/sshd_config' - role: '../../library/roles/sshd_config'
- { role: '../library/roles/letsencrypt-acme-sh-client', when: letsencrypt_acme_sh_install is defined and letsencrypt_acme_sh_install } - { role: 'letsencrypt-acme-sh-client', when: letsencrypt_acme_sh_install is defined and letsencrypt_acme_sh_install }
- { role: '../../library/roles/nagios', when: nagios_enabled is defined and nagios_enabled } - { role: 'zabbix-agent', when: zabbix_agent_install is defined and zabbix_agent_install }
- { role: '../../library/roles/prometheus-node-exporter', when: prometheus_enabled is defined and prometheus_enabled } - { role: '../../library/roles/prometheus-node-exporter', when: prometheus_enabled is defined and prometheus_enabled }
- src: git+https://gitea-s2i2s.isti.cnr.it/ISTI-ansible-roles/ansible-role-zabbix-agent.git
version: master
name: zabbix-agent
when: zabbix_agent_install | bool