From 41e2dcc7e97d1a4f658053faf2f64551780cd2bf Mon Sep 17 00:00:00 2001
From: Michael Scherer <misc@mageia.org>
Date: Thu, 9 Feb 2012 09:11:02 +0000
Subject: make it puppet-lint compliant, and use proper scoping for puppet 2.8
 migration ( ie, use $::foo instead of $foo for facts )

---
 modules/puppet/manifests/master.pp | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/modules/puppet/manifests/master.pp b/modules/puppet/manifests/master.pp
index 243e8137..5975b700 100644
--- a/modules/puppet/manifests/master.pp
+++ b/modules/puppet/manifests/master.pp
@@ -5,31 +5,32 @@ class puppet::master {
     # rails and sqlite3 are used for stored config
     package { ['ruby-sqlite3', 'puppet-server', 'ruby-rails']: }
 
-    service { puppetmaster:
-        subscribe => [ Package['puppet-server'], File['/etc/puppet/puppet.conf']]
+    service { 'puppetmaster':
+        subscribe => [Package['puppet-server'],
+                      File['/etc/puppet/puppet.conf']],
     }
 
     file { '/etc/puppet/extdata':
-        ensure => directory,
-        owner  => puppet,
-        group  => puppet,
-        mode   => '0700',
+        ensure  => directory,
+        owner   => puppet,
+        group   => puppet,
+        mode    => '0700',
         recurse => true,
     }
 
     file { '/etc/puppet/tagmail.conf':
-        content => template("puppet/tagmail.conf"),
+        content => template('puppet/tagmail.conf'),
     }
 
     tidy { '/var/lib/puppet/reports':
-        age     => "4w",
-        matches => "*.yaml",
+        age     => '4w',
+        matches => '*.yaml',
         recurse => true,
-        type    => "mtime",
+        type    => 'mtime',
     }
 
     file { '/etc/puppet/autosign.conf':
-        ensure  => $environment ? {
+        ensure  => $::environment ? {
                     'test'  => 'present',
                     default => 'absent',
         },
-- 
cgit v1.2.1