Skip to content

Commit

Permalink
Merge pull request #2 from artefactual-labs/dev/centos
Browse files Browse the repository at this point in the history
Misc. fixes (CentOS)
  • Loading branch information
hakamine committed Feb 19, 2016
2 parents 434d019 + 43ea0ce commit b734e57
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 28 deletions.
3 changes: 1 addition & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
Import from https://github.com/jdauphant/ansible-role-nginx (rev 5402635).

nginx
=====

Expand Down Expand Up @@ -210,4 +208,5 @@ Author Information

- Original : Benno Joy
- Modified by : DAUPHANT Julien
- Modified by : Artefactual Systems

18 changes: 5 additions & 13 deletions meta/main.yml
Original file line number Diff line number Diff line change
@@ -1,25 +1,17 @@
---
galaxy_info:
author: "Benno Joy, DAUPHANT Julien"
company: AnsibleWorks
author: "Artefactual Systems"
company: "Artefactual Systems"
license: BSD
min_ansible_version: 1.4
min_ansible_version: 2.0
platforms:
- name: EL
versions:
- 5
- 6
- name: Fedora
versions:
- 16
- 17
- 18
- 7
- name: Ubuntu
versions:
- precise
- quantal
- raring
- saucy
- trusty
categories:
- web
dependencies: []
Expand Down
16 changes: 6 additions & 10 deletions tasks/main.yml
Original file line number Diff line number Diff line change
@@ -1,19 +1,15 @@
---

- name: Install the selinux python module
yum: name=libselinux-python state=present
when: ansible_os_family == "RedHat"
tags: [packages,nginx]

- name: Copy the epel packages
copy: src=epel.repo dest=/etc/yum.repos.d/epel_ansible.repo
when: ansible_os_family == "RedHat"
tags: [packages,nginx]
- name: "Add epel-release repository"
yum:
name: "epel-release"
state: "latest"
when: ansible_distribution == 'CentOS'

- name: Install the nginx packages
yum: name={{ item }} state=present
with_items: redhat_pkg
when: ansible_os_family == "RedHat"
when: ansible_distribution == 'CentOS'
tags: [packages,nginx]

- name: Install the nginx packages
Expand Down
3 changes: 0 additions & 3 deletions vars/main.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
---

env:
RUNLEVEL: 1

redhat_pkg:
- nginx

Expand Down

0 comments on commit b734e57

Please sign in to comment.