summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMicah Anderson <micah@riseup.net>2012-10-17 15:08:19 -0400
committerMicah Anderson <micah@riseup.net>2012-10-17 15:08:19 -0400
commita8b4676955163dc5e4148e6968bc991c390f0333 (patch)
treeab79f68d15103442f1bb7e2fdf434254a8f959f7
parent7d0ae40d42613aac09f16627edd93a4f46ce1582 (diff)
lint module
Run puppet-lint on module, changes were minor, mostly just trailing spaces, and a couple instances of boolean values being quoted.
-rw-r--r--manifests/config.pp6
-rw-r--r--manifests/install.pp10
-rw-r--r--manifests/params.pp4
3 files changed, 10 insertions, 10 deletions
diff --git a/manifests/config.pp b/manifests/config.pp
index f61a83e..0f12b50 100644
--- a/manifests/config.pp
+++ b/manifests/config.pp
@@ -1,5 +1,5 @@
# Define bundler::config
-#
+#
# All config settings for candiapp class
#
# == Parameters
@@ -11,7 +11,7 @@
# [*app_dir*]
# App directory where Gemfile is located
# [*home_dir_base_path*]
-# Home directory of the specified user
+# Home directory of the specified user
# [*use_rvm*]
# Sets whether rvm is used. Defaults to true
# [*rvm_bin*]
@@ -45,7 +45,7 @@ define bundler::config (
$bundler_path = $bundler::params::bundler_path
) {
- Class['bundler::install'] -> Bundler::Config["${name}"]
+ Class['bundler::install'] -> Bundler::Config[${name}]
if $user == 'root' {
$home_dir = '/root'
diff --git a/manifests/install.pp b/manifests/install.pp
index 47ab022..fe7bb60 100644
--- a/manifests/install.pp
+++ b/manifests/install.pp
@@ -1,5 +1,5 @@
# Class bundler::install
-#
+#
# Installs bundler Ruby gem manager
#
# == Parameters
@@ -18,17 +18,17 @@
# include rvm
#
class bundler::install (
+ $ruby_version,
$ensure = 'present',
$use_rvm = $bundler::params::use_rvm,
- $ruby_version
-) inherits bundler::params {
+ ) inherits bundler::params {
- if $use_rvm == 'true' {
+ if $use_rvm == true {
#Install bundler with correct RVM
rvm_gem { 'bundler':
ensure => $ensure,
ruby_version => $ruby_version,
- }
+ }
}
else {
package { 'bundler':
diff --git a/manifests/params.pp b/manifests/params.pp
index c7988c2..109af98 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -1,5 +1,5 @@
# Class bundler::params
-#
+#
# All config settings for candiapp class
#
# == Parameters
@@ -17,7 +17,7 @@ class bundler::params {
ubuntu, debian: {
$user = 'root'
$home_dir_base_path = '/home'
- $use_rvm = 'true'
+ $use_rvm = true
$rvm_bin = '/usr/local/rvm/bin/rvm'
$rvm_gem_path = '/usr/local/rvm/gems'
$rvm_gemset = 'global'