Removed tls_cacertfile. Changed dashes to underscores.

thomaslarsen · Sep 30, 2015 · 73fd1f5 · 73fd1f5
1 parent 773877b
commit 73fd1f5
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 17 deletions.
diff --git a/pam/ldap.sls b/pam/ldap.sls
@@ -1,27 +1,19 @@
-{% from "pam-ldap/map.jinja" import pam with context %}
-
-tls_cacertfile:
-    file.managed:
-        - source: salt://pam-ldap/files/cert
-        - user: root
-        - group: root
-        - mode: 640
+{% from "pam/map.jinja" import pam with context %}
 
 ldap:
-    pkg:
-        - installed
-        - name: {{ pam.ldap }}
+  pkg.installed:
+    - name: {{ pam.ldap_pkg }}
 
 {{ pam.config }}:
    file.managed:
-        - source: salt://pam-ldap/files/ldap.conf
+        - source: salt://pam/files/ldap.conf
         - user: root
         - group: root
         - mode: 644
 
 ldap_conf:
   file.append:
-    - name: {{ pam.ldap-config }}
+    - name: {{ pam.ldap_config }}
     - text:
         - host {{ salt['pillar.get']('pam:ldap:host') }}
         {% if salt['pillar.get']('pam:ldap:port') %}

diff --git a/pam/map.jinja b/pam/map.jinja
@@ -1,11 +1,11 @@
 {% set pam = salt['grains.filter_by']({
     'Ubuntu': {
-        'ldap': 'ldap-auth-client',
+        'ldap_pkg': 'ldap-auth-client',
         'nsd': 'nscd',
-        'ldap-config': '/etc/ldap.conf',
+        'ldap_config': '/etc/ldap.conf',
     },
     'Debian': {
-        'ldap': 'libpam-ldap',
-        'ldap-config': '/etc/ldap.conf',
+        'ldap_pkg': 'libpam-ldap',
+        'ldap_config': '/etc/ldap.conf',
     },
 }, merge=salt['pillar.get']('pam:lookup')) %}