diff options
| author | Guilhem Moulin <guilhem@fripost.org> | 2017-07-29 13:47:43 +0200 |
|---|---|---|
| committer | Guilhem Moulin <guilhem@fripost.org> | 2017-07-29 13:47:43 +0200 |
| commit | a48661c2f5082b8e15a952aaf33b1e8848ffbe90 (patch) | |
| tree | 5b59f8f3c478f30e7926609a6b3786f3f22a00b5 /roles/common/tasks/main.yml | |
| parent | 874ee116c6f1ee61bca9cba4fa8347a26a0fa1e9 (diff) | |
Fix detection of KVM guests.
Diffstat (limited to 'roles/common/tasks/main.yml')
| -rw-r--r-- | roles/common/tasks/main.yml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/roles/common/tasks/main.yml b/roles/common/tasks/main.yml index 0230c0c..c63d7a4 100644 --- a/roles/common/tasks/main.yml +++ b/roles/common/tasks/main.yml @@ -1,53 +1,53 @@ --- - include: sysctl.yml tags: sysctl - include: hosts.yml - include: apt.yml tags: apt - name: Install intel-microcode apt: pkg=intel-microcode - when: "ansible_processor[0] | search('^(Genuine)?Intel.*') and not (ansible_virtualization_role == 'guest' and ansible_virtualization_type == 'xen')" + when: "ansible_processor[0] | search('^(Genuine)?Intel.*') and not ansible_virtualization_role == 'guest'" tags: intel - include: firewall.yml tags: - firewall - iptables - include: stunnel.yml tags: stunnel when: "'webmail' in group_names and 'LDAP-provider' not in group_names" - include: samhain.yml tags: samhain - include: auditd.yml tags: auditd - include: rkhunter.yml tags: rkhunter - include: clamav.yml tags: clamav - include: fail2ban.yml tags: fail2ban - include: smart.yml tags: - smartmontools - smart - when: "not ((ansible_virtualization_role == 'guest' and ansible_virtualization_type == 'xen') or ansible_system_vendor == 'QEMU')" + when: "not ansible_virtualization_role == 'guest'" - include: haveged.yml tags: - haveged - entropy - name: Copy genkeypair.sh and gendhparam.sh copy: src=usr/local/bin/{{ item }} dest=/usr/local/bin/{{ item }} owner=root group=staff mode=0755 tags: genkey with_items: - genkeypair.sh - gendhparam.sh - name: Generate DH parameters command: gendhparam.sh /etc/ssl/dhparams.pem 2048 creates=/etc/ssl/dhparams.pem tags: genkey - include: ipsec.yml tags: - strongswan |