Fix linting

manifests/config.pp

@@ -8,10 +8,10 @@
       group   => 'root',
       mode    => '0755',
       content => template('solr/solr.init.erb');
-    "${solr::home}":
+    $solr::home:
       ensure  => 'directory',
-      owner   => "${solr::tomcat_user}",
-      group   => "${solr::tomcat_group}",
+      owner   => $solr::tomcat_user,
+      group   => $solr::tomcat_group,
       mode    => '0755';
   }
   $warlocation = "${solr::root}/dist/apache-solr-${solr::version}.war"
@@ -29,9 +29,9 @@
   include concat::setup
   concat {"${solr::home}/solr.xml":
     # path    => "${solr::home}/solr.xml",
-    owner   => 'root',
-    group   => 'root',
-    mode    => '0644',
+    owner => 'root',
+    group => 'root',
+    mode  => '0644',
   }
   concat::fragment {'header':
     target  => "${solr::home}/solr.xml",

manifests/core.pp

@@ -1,20 +1,20 @@
 define solr::core (
-  $path = "${solr::home}/$name",
+  $path = "${solr::home}/${name}",
   $source = '/usr/share/solr/example/solr' )
   {
-    concat::fragment {"$name":
+    concat::fragment { $name:
       target  => "${solr::home}/solr.xml",
       order   => 15,
       content => template('solr/core.xml.erb');
   }
 
-  file {"${path}":
+  file { $path:
     ensure  => directory,
-    owner   => "${solr::tomcat_user}",
-    group   => "${solr::tomcat_group}",
+    owner   => $solr::tomcat_user,
+    group   => $solr::tomcat_group,
     mode    => '0755',
     recurse => true, # enable recursive directory management
-    source  => "${source}";
+    source  => $source,
   }
 
 }

manifests/init.pp

@@ -15,8 +15,8 @@
     debian  => 'tomcat6',
   },
   $version = '3.6.1',
-  $persistent = 'false',
-  $shareschema = 'true',
+  $persistent = false,
+  $shareschema = true,
   $masterurl = 'http://solrmaster:8080/solr/'
 
 )

manifests/packages.pp

@@ -1,27 +1,29 @@
 class solr::packages {
+  $solr_package = $::operatingsystem ? {
+    Centos => 'solr',
+    Debian => 'solr-common',
+  }
+  $java_package = $::operatingsystem ? {
+    'Centos' => $::operatingsystemrelease ? {
+      /6\.[0-3]/ => "java-1.6.0-openjdk.${::hardwaremodel}",
+      '*' => 'openjdk-6-jre',
+    },
+    'Debian' => 'openjdk-6-jre-headless',
+  }
   package {
     'solr':
       ensure => present,
-      name => $::operatingsystem ? {
-        Centos => 'solr',
-        Debian => 'solr-common',
-      };
+      name   => $solr_package,
   }
   package {
     'java':
       ensure => present,
-      name => $::operatingsystem ? {
-        'Centos' => $::operatingsystemrelease ? {
-          /6\.[0-3]/ => "java-1.6.0-openjdk.$::hardwaremodel",
-          '*' => 'openjdk-6-jre',
-        },
-        'Debian' => 'openjdk-6-jre-headless',
-      };
+      name   => $java_package,
   }
   package {
     'tomcat':
       ensure => present,
-      name => 'tomcat6';
+      name   => 'tomcat6';
   }
 
 }

manifests/services.pp

@@ -6,8 +6,8 @@
   #    require => File['solr initscript'];
   #}
   service { 'tomcat6':
-    ensure   => 'running',
-    enable => 'true',
+    ensure => 'running',
+    enable => true,
   }
 
 }