From: Peter Palfrader <peter@palfrader.org>
Date: Sat, 15 Jun 2013 23:33:30 +0000 (+0200)
Subject: Get timeserver property from ldap
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=284a7948f13a3932a5cc58c42f1b1bc72248c5dd;p=mirror%2Fdsa-puppet.git

Get timeserver property from ldap
---

diff --git a/modules/debian-org/misc/local.yaml b/modules/debian-org/misc/local.yaml
index f7b02acd0..83c6ed3ac 100644
--- a/modules/debian-org/misc/local.yaml
+++ b/modules/debian-org/misc/local.yaml
@@ -229,11 +229,6 @@ host_settings:
   'apache2_ftp-upcoming_mirror':
     - klecker.debian.org
     - rietz.debian.org
-  timeserver:
-    - busoni.debian.org
-    - merikanto.debian.org
-    - orff.debian.org
-    - ravel.debian.org
   not-bacula-client:
     - abel.debian.org
     - agricola.debian.org
diff --git a/modules/puppetmaster/lib/puppet/parser/functions/nodeinfo.rb b/modules/puppetmaster/lib/puppet/parser/functions/nodeinfo.rb
index cfbaa9c4c..cf8ea9dca 100644
--- a/modules/puppetmaster/lib/puppet/parser/functions/nodeinfo.rb
+++ b/modules/puppetmaster/lib/puppet/parser/functions/nodeinfo.rb
@@ -14,6 +14,7 @@ module Puppet::Parser::Functions
       end
       nodeinfo['hoster'] = function_whohosts([nodeinfo['ldap']['ipHostNumber'], "/etc/puppet/modules/debian-org/misc/hoster.yaml"])
       nodeinfo['buildd'] = (nodeinfo['ldap']['purpose'].respond_to?('include?') && nodeinfo['ldap']['purpose'].include?('buildd'))
+      nodeinfo['timeserver'] = (nodeinfo['ldap']['purpose'].respond_to?('include?') && nodeinfo['ldap']['purpose'].include?('timeserver'))
       nodeinfo['porterbox'] = (nodeinfo['ldap']['purpose'].respond_to?('include?') && nodeinfo['ldap']['purpose'].include?('porterbox'))
 
       if lookupvar('::mta') == 'exim4'