renaming to infrastructure_oraclejava and a few other minor cleanups
diff --git a/manifests/install.pp b/manifests/install.pp
index 9f4250c..eed8612 100644
--- a/manifests/install.pp
+++ b/manifests/install.pp
@@ -9,7 +9,7 @@
# oraclejava::install::unlimited_jce: true
# include oraclejava::install
-class oraclejava::install (
+class infrastructure_oraclejava::install (
$version = '8', # allowed values 6, 7, 8
$unlimited_jce = true,
$include_src = true,
@@ -19,13 +19,13 @@
case $::operatingsystem {
debian: {
include apt
- apt::source { 'webupd8team':
- location => "http://ppa.launchpad.net/webupd8team/java/ubuntu",
- release => "precise",
- repos => "main",
- key => "EEA14886",
- key_server => "keyserver.ubuntu.com",
- include_src => $include_src,
+ apt::source { 'webupd8team':
+ location => 'http://ppa.launchpad.net/webupd8team/java/ubuntu',
+ release => 'precise',
+ repos => 'main',
+ key => 'EEA14886',
+ key_server => 'keyserver.ubuntu.com',
+ include_src => $include_src,
}
file { '/tmp/java.preseed':
source => 'puppet:///modules/oraclejava/java.preseed',
@@ -42,8 +42,8 @@
backup => false,
}
}
- default: {
- notice "Unsupported operatingsystem ${::operatingsystem}"
+ default: {
+ notice "Unsupported operatingsystem ${::operatingsystem}"
}
}
@@ -60,7 +60,7 @@
$jdkpkg = 'oracle-java6-installer'
}
default: {
- notice "Invalid Java version"
+ notice 'Invalid Java version'
}
}
