linting

manifests/defines/env_fact.pp

@@ -16,8 +16,8 @@ define puppet::defines::env_fact ($value, $factname = '', $ensure = 'present') {
   }
 
   common::line { "env_fact-${factname_real}":
+    ensure => $ensure,
     line   => "export FACTER_${factname_real}=${value}",
     file   => '/etc/profile.d/env_facts.sh',
-    ensure => $ensure,
   }
 }

manifests/defines/private_dirs.pp

@@ -1,21 +1,21 @@
 ##########################################################################
-## define puppet::puppetmaster::privatedir
-##  $l_fqdn : hostname - lower case letters only
-##  $title :  hostname - as given in hosts client-cert
+# # define puppet::puppetmaster::privatedir
+# #  $l_fqdn : hostname - lower case letters only
+# #  $title :  hostname - as given in hosts client-cert
 ##
-## $puppet_privdir (declared in site.pp) must already exist!
+# # $puppet_privdir (declared in site.pp) must already exist!
 
-define puppet::puppetmaster::privatedir ( $l_fqdn ) {
-  file { "${puppet_privdir}/${l_fqdn}":
-    ensure  => directory,
-    owner   => puppet
+define puppet::defines::privatedir ($l_fqdn) {
+  file { "${::puppet_privdir}/${l_fqdn}":
+    ensure => directory,
+    owner  => puppet
   } # file
-  ## create link if cert-hostname and DNS-provided fqdn differ
+
+  # # create link if cert-hostname and DNS-provided fqdn differ
   if $title != $l_fqdn {
-    file { "${puppet_privdir}/${title}":
-      ensure  => "${puppet_privdir}/${l_fqdn}",
-      require => File["${puppet_privdir}/${l_fqdn}"]
+    file { "${::puppet_privdir}/${title}":
+      ensure  => "${::puppet_privdir}/${l_fqdn}",
+      require => File["${::puppet_privdir}/${l_fqdn}"]
     } # file
   } # if
-
 } # define puppet::puppetmaster::privatedir