diff --git a/molecule/ec2-centos-7/playbook.yml b/molecule/ec2-centos-7/playbook.yml index 71caa98..467a4f2 100644 --- a/molecule/ec2-centos-7/playbook.yml +++ b/molecule/ec2-centos-7/playbook.yml @@ -1,8 +1,6 @@ --- - name: Converge hosts: all - vars: - nginx_default_page_enabled: True roles: - role: xoxys.nginx diff --git a/tasks/install.yml b/tasks/install.yml index fa3f97d..9530c0b 100644 --- a/tasks/install.yml +++ b/tasks/install.yml @@ -85,7 +85,7 @@ - name: Set selinux booleans seboolean: - name: "{{ item.file }}" + name: "{{ item.name }}" state: "{{ item.state }}" persistent: "{{ item.persistent }}" loop: "{{ nginx_set_sebooleans }}" @@ -104,19 +104,7 @@ become_user: root - block: - - name: Add default page - template: - src: var/www/vhosts/default/index.html.j2 - dest: /var/www/vhosts/default/index.html - owner: "{{ nginx_user }}" - group: "{{ nginx_group }}" - mode: 0750 - when: nginx_default_page_enabled | bool - become: True - become_user: "{{ nginx_user }}" - -- block: - - name: Add default page configuration file + - name: Add vhost configuration files template: src: etc/nginx/sites-available/vhost.j2 dest: "/etc/nginx/sites-available/{{ item.file }}"