From cf69810612c4c46c9b44abb633141fda7f3a9554 Mon Sep 17 00:00:00 2001 From: Jeff Geerling Date: Mon, 29 Feb 2016 14:58:02 -0600 Subject: [PATCH] PR #46 follow-up. --- defaults/main.yml | 3 +-- tasks/setup-Debian.yml | 2 +- tasks/setup-RedHat.yml | 5 ++++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index 78cd367..caa5b67 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -2,8 +2,7 @@ # Used only for Debian/Ubuntu installation, as the -t option for apt. nginx_default_release: "" -# Distros like Debian/Ubuntu ships nginx package with different flavors, e.g. -# full, light or extras. +# The name of the nginx apt/yum package to install. nginx_package_name: "nginx" nginx_worker_processes: "1" diff --git a/tasks/setup-Debian.yml b/tasks/setup-Debian.yml index 2a72a15..43f9ab8 100644 --- a/tasks/setup-Debian.yml +++ b/tasks/setup-Debian.yml @@ -4,6 +4,6 @@ - name: Ensure nginx is installed. apt: - pkg: "{{ nginx_package_name }}" + name: "{{ nginx_package_name }}" state: installed default_release: "{{ nginx_default_release }}" diff --git a/tasks/setup-RedHat.yml b/tasks/setup-RedHat.yml index 73f205e..a1563b7 100644 --- a/tasks/setup-RedHat.yml +++ b/tasks/setup-RedHat.yml @@ -8,4 +8,7 @@ mode: 0644 - name: Ensure nginx is installed. - yum: pkg=nginx state=installed enablerepo=nginx + yum: + name: "{{ nginx_package_name }}" + state: installed + enablerepo: nginx