Permalink
Browse files

Merge branch 'master' of https://github.com/trifork/sdm4-parent

  • Loading branch information...
2 parents 5aa004b + c5a5a96 commit 40676de0f9a79ea821f5caab46fc0fe099ab7db9 @jrftrifork jrftrifork committed Sep 7, 2012
Showing with 7 additions and 14 deletions.
  1. +1 −4 checkout-importermodules.sh
  2. +6 −10 environment/modules/jdk/manifests/init.pp
@@ -1,6 +1,4 @@
#!/bin/sh
-git clone git@github.com:trifork/sdm4-vagrant-maven-plugin.git
-git clone git@github.com:trifork/sdm4-testutils.git
git clone git@github.com:trifork/sdm4-autorisationimporter.git
git clone git@github.com:trifork/sdm4-bemyndigelseimporter.git
git clone git@github.com:trifork/sdm4-cprimporter.git
@@ -11,5 +9,4 @@ git clone git@github.com:trifork/sdm4-sorrelationimporter.git
git clone git@github.com:trifork/sdm4-takstimporter.git
git clone git@github.com:trifork/sdm4-yderimporter.git
git clone git@github.com:trifork/sdm4-doseringimporter.git
-git clone git@github.com:trifork/sdm4-vitaminimporter.git
-
+git clone git@github.com:trifork/sdm4-vitaminimporter.git
@@ -1,17 +1,13 @@
class jdk() {
- file {"/tmp/jdk.tar.gz":
- ensure => present,
- source => "puppet:///modules/jdk/jdk.tar.gz"
- }
- exec {"unpack-jdk":
- command => "tar xvzf /tmp/jdk.tar.gz",
- cwd => "/pack",
- unless => "test -d /pack/jdk-1.6.0_24"
+
+ package { "openjdk-6-jdk":
+ ensure => installed
}
+
file {"/pack/jdk":
ensure => symlink,
- target => "/pack/jdk-1.6.0_24",
- require => Exec["unpack-jdk"]
+ target => "/usr/lib/jvm/java-6-openjdk",
+ require => Package["openjdk-6-jdk"]
}
file { "/etc/profile.d/sdm_java.sh":

0 comments on commit 40676de

Please sign in to comment.