Lint fix.

dyresen · Dec 15, 2012 · 74cebe3 · 74cebe3
1 parent d0777e2
commit 74cebe3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/puppet/modules/graphite/manifests/config.pp b/puppet/modules/graphite/manifests/config.pp
@@ -26,11 +26,9 @@
     ensure => present
   }
 
-  $htpasswd_path = '/etc/apache2/graphite.htpasswd'
-
   exec { 'create-graphite-htpasswd':
-    command   => "htpasswd -b -c ${htpasswd_path} ${auth}",
-    creates   => $htpasswd_path,
+    command   => "htpasswd -b -c ${graphite::params::htpasswd_path} ${graphite::params::auth}",
+    creates   => $graphite::params::htpasswd_path,
     require   => Class['apache'],
     logoutput => on_failure
   }

diff --git a/puppet/modules/graphite/manifests/params.pp b/puppet/modules/graphite/manifests/params.pp
@@ -17,6 +17,7 @@
   $storageroot      = "${root}/storage"
   $owner            = 'www-data'
   $auth             = hiera('basic_auth', 'hdo hdo')
+  $htpasswd_path    = '/etc/apache2/graphite.htpasswd'
 
   $graphite_version = 'graphite-web-0.9.10'
   $carbon_version   = 'carbon-0.9.10'