From 53d6ac4bf2e42ec58a86d6cbd944a221e37e6745 Mon Sep 17 00:00:00 2001
From: Ossi Salmi <osalmi@iki.fi>
Date: Mon, 26 Aug 2013 16:49:55 +0300
Subject: [PATCH] abusesa: Update search jar names

---
 abusesa/manifests/init.pp | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/abusesa/manifests/init.pp b/abusesa/manifests/init.pp
index 97318e5..86ea10b 100644
--- a/abusesa/manifests/init.pp
+++ b/abusesa/manifests/init.pp
@@ -113,7 +113,7 @@ class abusesa::search {
     }
 
     if !$abusesa_search_solrurl {
-        fail("Must define \$abusesa_search_solrurl")
+        $abusesa_search_solrurl = "https://${::homename}/solr/generic/"
     }
 
     file { "/usr/local/src/abusesa-search.tar.gz":
@@ -160,39 +160,43 @@ class abusesa::search {
             File["/srv/solr/cores"],
             Util::Extract::Tar["/usr/local/src/abusesa-search"],
         ],
+        notify  => Service["solr"],
     }
     file { "/srv/solr/cores/lib/solr-analysis-clarified.jar":
         ensure  => present,
         mode    => "0660",
         owner   => "solr",
         group   => "solr",
-        source  => "/usr/local/src/abusesa-search/bin/solr-4.2-analysis-clarified.jar",
+        source  => "/usr/local/src/abusesa-search/bin/solr-4.4.0-analysis-clarified.jar",
         require => [
             File["/srv/solr/cores/lib"],
             Util::Extract::Tar["/usr/local/src/abusesa-search"],
         ],
+        notify  => Service["solr"],
     }
     file { "/srv/solr/cores/lib/commons-net-3.1.jar":
         ensure  => present,
         mode    => "0660",
         owner   => "solr",
         group   => "solr",
-        source  => "/usr/local/src/abusesa-search/sources/analysis-clarified/lib/commons-net-3.1.jar",
+        source  => "/usr/local/src/abusesa-search/search/analysis-clarified/lib/commons-net-3.1.jar",
         require => [
             File["/srv/solr/cores/lib"],
             Util::Extract::Tar["/usr/local/src/abusesa-search"],
         ],
+        notify  => Service["solr"],
     }
     file { "/srv/solr/cores/lib/java-ipv6-0.8.jar":
         ensure  => present,
         mode    => "0660",
         owner   => "solr",
         group   => "solr",
-        source  => "/usr/local/src/abusesa-search/sources/analysis-clarified/lib/java-ipv6-0.8.jar",
+        source  => "/usr/local/src/abusesa-search/search/analysis-clarified/lib/java-ipv6-0.8.jar",
         require => [
             File["/srv/solr/cores/lib"],
             Util::Extract::Tar["/usr/local/src/abusesa-search"],
         ],
+        notify  => Service["solr"],
     }
 
     $htdocs = $::operatingsystem ? {