Minor changes after running puppet-lint

maestrodev · Aug 21, 2014 · 527d35f · 527d35f
1 parent 120568b
commit 527d35f
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 32 deletions.
diff --git a/manifests/init.pp b/manifests/init.pp
@@ -1,4 +1,4 @@
-class artifactory ( 
+class artifactory (
   $username     = $artifactory::params::username,
   $pass_hash    = $artifactory::params::pass_hash,
   $manage_java  = $artifactory::params::manage_java,

diff --git a/manifests/install.pp b/manifests/install.pp
@@ -1,47 +1,47 @@
 class artifactory::install inherits artifactory {
 
-  if $::osfamily == "Debian" {
+  if $::osfamily == 'Debian' {
 
-    $url = "http://dl.bintray.com/jfrog/artifactory/artifactory-${app_version}.zip"
-    $extracted = "$app_dir/artifactory-${app_version}"
+    $url = "http://dl.bintray.com/jfrog/artifactory/artifactory-${artifactory::app_version}.zip"
+    $artifactory::extracted = "${artifactory::app_dir}/artifactory-${artifactory::app_version}"
 
     if $caller_module_name != $module_name {
       fail("Use of private class ${name} by ${caller_module_name}")
     }
 
-    file { $app_data:
+    file { $artifactory::app_data:
       ensure => directory,
       mode   => '0755',
-      owner  => $username,
-      group  => $username
+      owner  => $artifactory::username,
+      group  => $artifactory::username
     }
-    -> file { $app_dir:
+    -> file { $artifactory::app_dir:
       ensure => directory,
       mode   => '0755',
-      owner  => $username,
-      group  => $username
+      owner  => $artifactory::username,
+      group  => $artifactory::username
     }
-    -> staging::deploy { "artifactory-${app_version}.zip":
+    -> staging::deploy { "artifactory-${artifactory::app_version}.zip":
       source  => $url,
-      creates => $extracted,
-      target  => $app_dir,
-      user    => $username,
-      group   => $username
+      creates => $artifactory::extracted,
+      target  => $artifactory::app_dir,
+      user    => $artifactory::username,
+      group   => $artifactory::username
     }
-    -> file { "${app_dir}/current":
+    -> file { "${artifactory::app_dir}/current":
       ensure => link,
-      target => $extracted
+      target => $artifactory::extracted
     }
-    -> file { "${app_dir}/current/data":
+    -> file { "${artifactory::app_dir}/current/data":
       ensure => link,
-      target => $app_data
+      target => $artifactory::app_data
     }
 
-  } elsif $::osfamily == "RedHat" {
+  } elsif $::osfamily == 'RedHat' {
     package { 'artifactory':
       ensure   => installed,
-      provider => "rpm",
-      source   => "http://downloads.sourceforge.net/project/artifactory/artifactory/${app_version}/artifactory-${app_version}.rpm",
+      provider => 'rpm',
+      source   => "http://downloads.sourceforge.net/project/artifactory/artifactory/${artifactory::app_version}/artifactory-${artifactory::app_version}.rpm",
     }
   }
 

diff --git a/manifests/service.pp b/manifests/service.pp
@@ -1,6 +1,6 @@
 class artifactory::service inherits artifactory {
-  
-  if $::osfamily == "Debian" {
+
+  if $::osfamily == 'Debian' {
 
     file { '/etc/init.d/artifactory':
       ensure  => present,
@@ -15,14 +15,14 @@
       enable   => true,
     }
 
-  } elsif $::osfamily == "RedHat" {
+  } elsif $::osfamily == 'RedHat' {
 
     service { 'artifactory':
       ensure    => 'running',
-      enable    => "true",
-      hasstatus => "false",
-      provider  => "redhat",
-      require   => Package['artifactory'] 
+      enable    => true,
+      hasstatus => false,
+      provider  => 'redhat',
+      require   => Package['artifactory']
     }
   }
 

diff --git a/manifests/user.pp b/manifests/user.pp
@@ -4,10 +4,10 @@
     fail("Use of private class ${name} by ${caller_module_name}")
   }
 
-  user { $username:
+  user { $artifactory::username:
     ensure      => present,
     managehome  => true,
-    home        => $app_data,
-    password    => $pass_hash
+    home        => $artifactory::app_data,
+    password    => $artifactory::pass_hash
   }
 }