diff --git a/tasks/main.yml b/tasks/main.yml index 43266a309ccaba5e3f34edca3a3285ee09983d68..82c4a999fa0b7e77602b2b004ba6d7e9b0efabae 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -5,7 +5,6 @@ that: - ansible_os_family in aliases_file - ansible_os_family in nginx_user - - ansible_pkg_mgr != 'openbsd_pkg' or ansible_distribution_version in nginx_openbsd_pkg - name: Check if dhparams file exists stat: @@ -23,7 +22,7 @@ - name: pkg install when: ansible_pkg_mgr == 'openbsd_pkg' openbsd_pkg: - name: '{{ nginx_openbsd_pkg[ansible_distribution_version] }}' + name: nginx%1 state: present - name: Alias emails to root diff --git a/vars/main.yml b/vars/main.yml index 16e6d3e1de557402939edd46fc1ee7b620c6d8a5..101a754712a78ef41c54608d301e635c33d6cd85 100644 --- a/vars/main.yml +++ b/vars/main.yml @@ -1,12 +1,5 @@ --- # vars file for nginx -nginx_openbsd_pkg: - '5.5': nginx-1.5.7 - '5.6': nginx-1.5.7p3 - '5.7': nginx-1.7.10 - '5.8': nginx-1.9.3p3 - '5.9': nginx-1.9.10 - '6.0': nginx-1.10.1 aliases_file: OpenBSD: /etc/mail/aliases