Get timeserver property from ldap

diff --git a/modules/debian-org/misc/local.yaml b/modules/debian-org/misc/local.yaml
index f7b02acd047b7caa0bc2494da488a069f1a9e327..83c6ed3ac43e86f0801e0c0f8b72420916e7f1bb 100644 (file)
--- 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 cfbaa9c4ce775175c9b5093c53a3c44ab08aaddb..cf8ea9dca011bdc4a996c6b53b911924ec9567ee 100644 (file)
--- 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'