From f57f609f8468dabde63fe86972b08d38603c5f85 Mon Sep 17 00:00:00 2001
From: stephane <stephane@alum.mit.edu>
Date: Wed, 8 Apr 2015 12:40:33 -0700
Subject: [PATCH] Upgrade wildfly puppet module

We are currently on version 0.1.7 of the Wildfly puppet module. The
latest tagged release is 0.2.1. Since we aren't using wildfly
elsewhere at the moment, upgrade the module. (See related commit
Ia144b9c716a82e8152a7962124f4184cdfe7dccd) The new wildfly puppet
module has removed the "--no-check-certificate" flag, so we need to
change the download location for wildfly so we can continue to use
https (the previous URL had certificate issues).

Also fix a dependency issue that didn't get caught until I tested
this change more.

Change-Id: I9f38b9425696ba9f955f9719f64992314316e83e
---
 manifests/init.pp    | 3 ++-
 manifests/wildfly.pp | 8 ++------
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/manifests/init.pp b/manifests/init.pp
index b5ae9d0..930484d 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -23,7 +23,7 @@ class zanata(
   $zanata_db_password,
 
   $zanata_wildfly_version = '8.1.0',
-  $zanata_wildfly_install_url = 'https://download.jboss.org/wildfly/8.1.0.Final/wildfly-8.1.0.Final.tar.gz',
+  $zanata_wildfly_install_url = 'https://repo1.maven.org/maven2/org/wildfly/wildfly-dist/8.1.0.Final/wildfly-dist-8.1.0.Final.tar.gz',
 
   $zanata_hibernate_url = 'https://sourceforge.net/projects/zanata/files/wildfly/wildfly-8.1.0.Final-module-hibernate-main-4.2.15.Final.zip',
   $zanata_mojarra_url = 'https://sourceforge.net/projects/zanata/files/wildfly/wildfly-8.1.0.Final-module-mojarra-2.1.28.zip',
@@ -131,6 +131,7 @@ class zanata(
     target  => '/usr/share/java/mysql-connector-java.jar',
     require => [
                 Package['libmysql-java'],
+                Class['zanata::wildfly'],
                 ],
   }
 
diff --git a/manifests/wildfly.pp b/manifests/wildfly.pp
index 2989b08..a113125 100644
--- a/manifests/wildfly.pp
+++ b/manifests/wildfly.pp
@@ -16,20 +16,16 @@
 #
 class zanata::wildfly(
   $wildfly_version = '8.1.0',
-  $wildfly_install_source = 'https://download.jboss.org/wildfly/8.1.0.Final/wildfly-8.1.0.Final.tar.gz',
+  $wildfly_install_source = 'https://repo1.maven.org/maven2/org/wildfly/wildfly-dist/8.1.0.Final/wildfly-dist-8.1.0.Final.tar.gz',
 ) {
-  include wildfly
 
   package { 'openjdk-7-jre-headless':
     ensure => present,
   }
 
-  $wildfly_install_file = inline_template('<%= File.basename(@wildfly_install_source) %>')
-
-  class { 'wildfly::install':
+  class { '::wildfly':
     version        => $wildfly_version,
     install_source => $wildfly_install_source,
-    install_file   => $wildfly_install_file,
     config         => 'standalone.xml',
     java_home      => '/usr/lib/jvm/java-7-openjdk-amd64/jre/',
     require        => Package['openjdk-7-jre-headless'],