From c2265a81f600fde73cab1ee17abf76f1ae567341 Mon Sep 17 00:00:00 2001 From: Niels Abspoel Date: Thu, 1 Jan 2015 23:19:47 +0100 Subject: [PATCH] Added archlinux support and improved lookup table --- sudoers/init.sls | 2 +- sudoers/map.jinja | 21 +++++++++++---------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/sudoers/init.sls b/sudoers/init.sls index 030eabc..922fdf7 100644 --- a/sudoers/init.sls +++ b/sudoers/init.sls @@ -2,7 +2,7 @@ sudo: pkg.installed: - - name: {{ sudoers.pkgs|json }} + - name: {{ sudoers.pkg }} {{ sudoers.get('config-path', '/etc') }}/sudoers: file.managed: diff --git a/sudoers/map.jinja b/sudoers/map.jinja index e1859da..e0052c3 100644 --- a/sudoers/map.jinja +++ b/sudoers/map.jinja @@ -1,13 +1,14 @@ -{% set sudoers = salt['grains.filter_by'])({ - 'Debian': {'sudo': 'sudo'}, - 'Ubuntu': {'sudo': 'sudo'}, - 'CentOS': {'sudo': 'sudo'}, - 'Fedora': {'sudo': 'sudo'}, - 'RedHat': {'sudo': 'sudo'}, - 'Amazon': {'sudo': 'sudo'}, - 'Gentoo': {'sudo': 'app-admin/sudo'}, - 'Mint': {'sudo': 'sudo'}, - 'FreeBSD': {'sudo': 'sudo', +{% set sudoers = salt['grains.filter_by']({ + 'Debian': {'pkg': 'sudo'}, + 'Ubuntu': {'pkg': 'sudo'}, + 'CentOS': {'pkg': 'sudo'}, + 'Fedora': {'pkg': 'sudo'}, + 'RedHat': {'pkg': 'sudo'}, + 'Amazon': {'pkg': 'sudo'}, + 'Gentoo': {'pkg': 'app-admin/sudo'}, + 'Mint': {'pkg': 'sudo'}, + 'Arch': {'pkg': 'sudo'}, + 'FreeBSD': {'pkg': 'sudo', 'config-path': '/usr/local/etc', 'group': 'wheel'}, }, merge=salt['pillar.get']('sudoers:lookup')) %}