From fdc9a7da78245163182a130e653eeada0eb330ab Mon Sep 17 00:00:00 2001 From: Jeff Geerling Date: Fri, 2 Jan 2015 11:47:26 -0600 Subject: [PATCH] Issue #6 and PR #8: Make nginx user more flexible. --- README.md | 4 ++-- defaults/main.yml | 1 - tasks/main.yml | 10 ++++++++++ tests/test.yml | 2 -- vars/Debian.yml | 2 ++ vars/RedHat.yml | 2 ++ vars/main.yml | 1 - 7 files changed, 16 insertions(+), 6 deletions(-) create mode 100644 vars/Debian.yml create mode 100644 vars/RedHat.yml delete mode 100644 vars/main.yml diff --git a/README.md b/README.md index 97ccdd1..0f128b0 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ None. ## Role Variables -Available variables are listed below, along with default values (see `vars/main.yml` and `defaults/main.yml`): +Available variables are listed below, along with default values (see `defaults/main.yml`): nginx_remove_default_vhost: false nginx_default_vhost_path: /etc/nginx/sites-enabled/default @@ -21,7 +21,7 @@ Whether to remove the 'default' virtualhost configuration supplied by Nginx. Use nginx_user: "nginx" -The user under which Nginx will run. +The user under which Nginx will run. Defaults to `nginx` for RedHat, and `www-data` for Debian. nginx_worker_processes: "1" nginx_worker_connections: "8192" diff --git a/defaults/main.yml b/defaults/main.yml index 203357d..0ade890 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -1,5 +1,4 @@ --- -nginx_user: "nginx" nginx_worker_processes: "1" nginx_worker_connections: "8192" nginx_client_max_body_size: "64m" diff --git a/tasks/main.yml b/tasks/main.yml index 5491d0b..9adccc5 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -1,4 +1,14 @@ --- +# Variable setup. +- name: Include OS-specific variables. + include_vars: "{{ ansible_os_family }}.yml" + +- name: Define nginx_user. + set_fact: + nginx_user: "{{ __nginx_user }}" + when: nginx_user is not defined + +# Nginx setup. - name: Enable nginx repo (RedHat). copy: > src=nginx.repo diff --git a/tests/test.yml b/tests/test.yml index 65139b9..42bba2c 100644 --- a/tests/test.yml +++ b/tests/test.yml @@ -1,7 +1,5 @@ --- - hosts: localhost remote_user: root - vars: - nginx_user: root roles: - ansible-role-nginx diff --git a/vars/Debian.yml b/vars/Debian.yml new file mode 100644 index 0000000..54bb631 --- /dev/null +++ b/vars/Debian.yml @@ -0,0 +1,2 @@ +--- +__nginx_user: "www-data" diff --git a/vars/RedHat.yml b/vars/RedHat.yml new file mode 100644 index 0000000..13d5b86 --- /dev/null +++ b/vars/RedHat.yml @@ -0,0 +1,2 @@ +--- +__nginx_user: "nginx" diff --git a/vars/main.yml b/vars/main.yml deleted file mode 100644 index ed97d53..0000000 --- a/vars/main.yml +++ /dev/null @@ -1 +0,0 @@ ----