From 24e66ca8bfd1fc26ee0c5a33ee2608bb6b3a6b73 Mon Sep 17 00:00:00 2001
From: abednarik <alejandro.bednarik@gmail.com>
Date: Wed, 16 Aug 2017 09:32:42 -0300
Subject: [PATCH] Remove dashes from variables.

Dashes causes some weird issues while rendering jinja templates.
---
 sudoers/included.sls | 2 +-
 sudoers/init.sls     | 4 ++--
 sudoers/map.jinja    | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/sudoers/included.sls b/sudoers/included.sls
index 6804b49..388e4a8 100644
--- a/sudoers/included.sls
+++ b/sudoers/included.sls
@@ -18,5 +18,5 @@ include:
         included: True
         sudoers: {{ spec|json }}
     - require:
-      - file: {{ sudoers.get('config-path', '/etc') }}/sudoers
+      - file: {{ sudoers.get('configpath', '/etc') }}/sudoers
 {% endfor %}
diff --git a/sudoers/init.sls b/sudoers/init.sls
index e93ce3c..bbecde9 100644
--- a/sudoers/init.sls
+++ b/sudoers/init.sls
@@ -4,14 +4,14 @@ sudo:
   pkg.installed:
     - name: {{ sudoers.pkg }}
 
-{{ sudoers.get('config-path', '/etc') }}/sudoers:
+{{ sudoers.get('configpath', '/etc') }}/sudoers:
   file.managed:
     - user: root
     - group: {{ sudoers.get('group', 'root') }}
     - mode: 440
     - template: jinja
     - source: salt://sudoers/files/sudoers
-    - check_cmd: {{ sudoers.get('exec-prefix', '/usr/sbin') }}/visudo -c -f
+    - check_cmd: {{ sudoers.get('execprefix', '/usr/sbin') }}/visudo -c -f
     - context:
         included: False
     - require:
diff --git a/sudoers/map.jinja b/sudoers/map.jinja
index 92506c3..885edac 100644
--- a/sudoers/map.jinja
+++ b/sudoers/map.jinja
@@ -10,7 +10,7 @@
     'Arch':    {'pkg': 'sudo'},
     'Suse':    {'pkg': 'sudo'},
     'FreeBSD': {'pkg': 'sudo',
-                'config-path': '/usr/local/etc',
-                'exec-prefix': '/usr/local/sbin',
+                'configpath': '/usr/local/etc',
+                'execprefix': '/usr/local/sbin',
                 'group': 'wheel'},
 }, merge=salt['pillar.get']('sudoers:lookup')) %}