From 5db90260cc5da93e946e85d162c71a88d53c2881 Mon Sep 17 00:00:00 2001 From: Gregory Ballantine Date: Fri, 17 Mar 2023 16:56:05 -0400 Subject: [PATCH] Updated formula for FreeBSD --- README.md | 11 +++++++++++ nslcd/defaults.yaml | 2 +- nslcd/init.sls | 4 ++++ nslcd/map.jinja | 7 +++++-- 4 files changed, 21 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index ef8b123..4b60d50 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,13 @@ # nslcd-formula + SaltStack formula to manage nslcd service and configuration + +## States + +`nslcd` + +Manages the nslcd installation, service and configuration. + +`nslcd.pam_ldap` + +Installs the pam_ldap package and configures it. diff --git a/nslcd/defaults.yaml b/nslcd/defaults.yaml index eb7d264..88ba951 100644 --- a/nslcd/defaults.yaml +++ b/nslcd/defaults.yaml @@ -4,7 +4,7 @@ nslcd: conf_path: /etc/nslcd.conf conf_user: root conf_group: root - conf_mode: 640 + conf_mode: 600 service_name: nslcd service_enable: True diff --git a/nslcd/init.sls b/nslcd/init.sls index f59049d..835d518 100644 --- a/nslcd/init.sls +++ b/nslcd/init.sls @@ -1,8 +1,10 @@ {% from "nslcd/map.jinja" import nslcd_settings as nslcd with context %} +{% if nslcd.package_name %} nslcd_package: pkg.installed: - name: {{ nslcd.package_name }} +{% endif %} nslcd_conf: file.managed: @@ -20,5 +22,7 @@ nslcd_service: - name: {{ nslcd.service_name }} - enable: {{ nslcd.service_enable }} - watch: + {% if nslcd.package_name %} - pkg: nslcd_package + {% endif %} - file: nslcd_conf diff --git a/nslcd/map.jinja b/nslcd/map.jinja index 610ba00..74e780e 100644 --- a/nslcd/map.jinja +++ b/nslcd/map.jinja @@ -11,9 +11,12 @@ that differ from whats in defaults.yaml {% set flavor_map = salt['grains.filter_by']( { 'Debian': {}, - 'FreeBSD': {}, + 'FreeBSD': { + 'package_name': False, + 'conf_path': '/usr/local/etc/nslcd.conf', + }, 'RedHat': { - 'package_name': 'nss-pam-ldapd' + 'package_name': 'nss-pam-ldapd', } }, grain='os_family',