From b4310cfc89c8da3c9e0b7a3c292e208aa4f7db15 Mon Sep 17 00:00:00 2001 From: Alan Orth Date: Sat, 22 Aug 2015 22:51:19 +0300 Subject: [PATCH] Allow Debian hosts to run Ubuntu stuff Sometimes we mean Ubuntu, other times we mean Debian family. Use ansible_os_family where we mean Debian family. Signed-off-by: Alan Orth --- vars/{Ubuntu.yml => Debian.yml} | 0 web.yml | 12 ++++++------ 2 files changed, 6 insertions(+), 6 deletions(-) rename vars/{Ubuntu.yml => Debian.yml} (100%) diff --git a/vars/Ubuntu.yml b/vars/Debian.yml similarity index 100% rename from vars/Ubuntu.yml rename to vars/Debian.yml diff --git a/web.yml b/web.yml index 46c0238..14bda64 100644 --- a/web.yml +++ b/web.yml @@ -6,13 +6,13 @@ user: provisioning sudo: yes roles: - - { role: common, when: ansible_distribution == 'Ubuntu' } - - { role: mariadb, when: ansible_distribution == 'Ubuntu' } - - { role: nginx, when: ansible_distribution == 'Ubuntu' } - - { role: php5-fpm, when: ansible_distribution == 'Ubuntu' } - - { role: munin, when: ansible_distribution == 'Ubuntu' } + - { role: common, when: ansible_os_family == 'Debian' } + - { role: mariadb, when: ansible_os_family == 'Debian' } + - { role: nginx, when: ansible_os_family == 'Debian' } + - { role: php5-fpm, when: ansible_os_family == 'Debian' } + - { role: munin, when: ansible_os_family == 'Debian' } vars_files: - vars/ipsets.yml - - "vars/{{ ansible_distribution }}.yml" + - "vars/{{ ansible_os_family }}.yml" # vim: set sw=2 ts=2: