From: Stephen Gran <steve@lobefin.net>
Date: Wed, 26 Jan 2011 07:26:07 +0000 (+0000)
Subject: move ldap.conf as test of new file structure
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=5dcc696618615663c3523f8768b596770eb53611;p=mirror%2Fdsa-puppet.git

move ldap.conf as test of new file structure

Signed-off-by: Stephen Gran <steve@lobefin.net>
---

diff --git a/files/etc/ldap/ldap.conf b/files/etc/ldap/ldap.conf
deleted file mode 100644
index 9dd5311bb..000000000
--- a/files/etc/ldap/ldap.conf
+++ /dev/null
@@ -1,24 +0,0 @@
-##
-## THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
-## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
-##
-
-#
-# LDAP Defaults
-#
-
-# See ldap.conf(5) for details
-# This file should be world readable but not world writable.
-
-#BASE	dc=example,dc=com
-#URI	ldap://ldap.example.com ldap://ldap-master.example.com:666
-
-#SIZELIMIT	12
-#TIMELIMIT	15
-#DEREF		never
-
-URI             ldap://db.debian.org
-BASE            dc=debian,dc=org
-
-TLS_CACERT      /etc/ssl/certs/spi-cacert-2008.pem
-TLS_REQCERT     hard
diff --git a/modules/debian-org/files/ldap.conf b/modules/debian-org/files/ldap.conf
new file mode 100644
index 000000000..9dd5311bb
--- /dev/null
+++ b/modules/debian-org/files/ldap.conf
@@ -0,0 +1,24 @@
+##
+## THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
+## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
+##
+
+#
+# LDAP Defaults
+#
+
+# See ldap.conf(5) for details
+# This file should be world readable but not world writable.
+
+#BASE	dc=example,dc=com
+#URI	ldap://ldap.example.com ldap://ldap-master.example.com:666
+
+#SIZELIMIT	12
+#TIMELIMIT	15
+#DEREF		never
+
+URI             ldap://db.debian.org
+BASE            dc=debian,dc=org
+
+TLS_CACERT      /etc/ssl/certs/spi-cacert-2008.pem
+TLS_REQCERT     hard
diff --git a/modules/debian-org/manifests/init.pp b/modules/debian-org/manifests/init.pp
index 6a16b404f..9d2d50295 100644
--- a/modules/debian-org/manifests/init.pp
+++ b/modules/debian-org/manifests/init.pp
@@ -85,7 +85,7 @@ class debian-org {
             ;
         "/etc/ldap/ldap.conf":
             require => Package["userdir-ldap"],
-            source => "puppet:///files/etc/ldap/ldap.conf",
+            source => "puppet:///modules/debian.org/ldap.conf",
             ;
         "/etc/pam.d/common-session":
             require => Package["libpam-pwdfile"],