Merge pull request #97 from danieldreier/lintfix

trivial puppet-lint fixes

Author: Zach Leslie

README.md

@@ -10,7 +10,7 @@
 At an absolute minimum, you need the following.
 
 ``` Puppet
-class { "puppet::server":
+class { 'puppet::server':
   servertype   => 'standalone',
   manifest     => '/etc/puppet/manifests/site.pp',
   ca           => true,
@@ -26,13 +26,13 @@ something that scales a bit more.
 ``` Puppet
 class service::puppet::master($servertype, $ca = false) {
 
-  class { "::puppet::server":
+  class { '::puppet::server':
     modulepath   => [
       '$confdir/modules/site',
       '$confdir/env/$environment/dist',
     ],
-    storeconfigs => "puppetdb",
-    reporturl    => "https://my.puppet.dashboard/reports",
+    storeconfigs => 'puppetdb',
+    reporturl    => 'https://my.puppet.dashboard/reports',
     servertype   => 'unicorn',
     manifest     => '$confdir/environments/$environment/site.pp',
     ca           => $ca,

manifests/dashboard.pp

@@ -25,13 +25,13 @@
   $db_host   = 'localhost',
   $db_name   = 'puppet_dashboard',
   $manage_db = true,
-  $site      = "dashboard.${domain}",
+  $site      = "dashboard.${::domain}",
   $allowip   = ''
 ) {
 
   include ruby::dev
 
-  $allow_all_ips  = "${allowip},${ipaddress}"
+  $allow_all_ips  = "${allowip},${::ipaddress}"
   $approot        = '/usr/share/puppet-dashboard'
   $dashboard_site = $site
 
@@ -64,7 +64,7 @@
 
   if $manage_db {
     # FIXME THIS IS NOT COMPATIBLE WITH THE NEW MYSQL MODULE
-    mysql::db { "dashboard_production":
+    mysql::db { 'dashboard_production':
       db_user => $db_user,
       db_pw   => $db_pw;
     }
@@ -97,9 +97,9 @@
       "${approot}/public/stylesheets",
       "${approot}/public/javascript"
   ]:
-    mode => 0755,
-    owner => 'www-data',
-    group => 'www-data',
+    mode    => '0755',
+    owner   => 'www-data',
+    group   => 'www-data',
     require => Package['puppet-dashboard'],
   }
 }

manifests/reports.pp

@@ -1,5 +1,5 @@
 class puppet::reports {
-  $report_dir = $puppet_major_version ? {
+  $report_dir = $::puppet_major_version ? {
     '3' => '/usr/lib/ruby/vendor_ruby/puppet/reports',
     '2' => '/usr/lib/ruby/1.8/puppet/reports',
   }