[debian-lan-devel] [debian-lan] 01/07: Use preseeding instead of editing the config file.

[Andreas B. Mundt]

This is an automated email from the git hooks/post-receive script.

andi pushed a commit to branch master
in repository debian-lan.

commit 7d6e3d15c2d86287f5bc1da99e02071951497333
Author: Andreas B. Mundt <andi at debian.org>
Date:   Thu Sep 4 21:36:14 2014 +0200

    Use preseeding instead of editing the config file.
---
 fai/config/debconf/LDAP_CLIENT               |  1 +
 fai/config/scripts/LDAP_CLIENT/20-nslcd.conf | 12 ------------
 2 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/fai/config/debconf/LDAP_CLIENT b/fai/config/debconf/LDAP_CLIENT
index ab64f54..41c9a98 100644
--- a/fai/config/debconf/LDAP_CLIENT
+++ b/fai/config/debconf/LDAP_CLIENT
@@ -3,3 +3,4 @@ nslcd nslcd/ldap-base string dc=intern
 nslcd nslcd/ldap-uris string ldap://ldap
 nslcd nslcd/ldap-starttls boolean true
 nslcd nslcd/ldap-reqcert select demand
+nslcd nslcd/ldap-cacertfile string /etc/ldap/slapd.crt
diff --git a/fai/config/scripts/LDAP_CLIENT/20-nslcd.conf b/fai/config/scripts/LDAP_CLIENT/20-nslcd.conf
deleted file mode 100755
index 83b218a..0000000
--- a/fai/config/scripts/LDAP_CLIENT/20-nslcd.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/usr/sbin/cfagent -f
-
-control:
-   any::
-   actionsequence = ( editfiles )
-   EditFileSize = ( 30000 )
-
-editfiles:
-   any::
-      { ${target}/etc/nslcd.conf
-         AppendIfNoSuchLine "tls_cacertfile /etc/ldap/slapd.crt"
-      }

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/debian-lan.git