abusesa: Update search jar names

This commit is contained in:
Ossi Salmi 2013-08-26 16:49:55 +03:00
parent 0f1d4fdac7
commit 53d6ac4bf2

View file

@ -113,7 +113,7 @@ class abusesa::search {
} }
if !$abusesa_search_solrurl { 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": file { "/usr/local/src/abusesa-search.tar.gz":
@ -160,39 +160,43 @@ class abusesa::search {
File["/srv/solr/cores"], File["/srv/solr/cores"],
Util::Extract::Tar["/usr/local/src/abusesa-search"], Util::Extract::Tar["/usr/local/src/abusesa-search"],
], ],
notify => Service["solr"],
} }
file { "/srv/solr/cores/lib/solr-analysis-clarified.jar": file { "/srv/solr/cores/lib/solr-analysis-clarified.jar":
ensure => present, ensure => present,
mode => "0660", mode => "0660",
owner => "solr", owner => "solr",
group => "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 => [ require => [
File["/srv/solr/cores/lib"], File["/srv/solr/cores/lib"],
Util::Extract::Tar["/usr/local/src/abusesa-search"], Util::Extract::Tar["/usr/local/src/abusesa-search"],
], ],
notify => Service["solr"],
} }
file { "/srv/solr/cores/lib/commons-net-3.1.jar": file { "/srv/solr/cores/lib/commons-net-3.1.jar":
ensure => present, ensure => present,
mode => "0660", mode => "0660",
owner => "solr", owner => "solr",
group => "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 => [ require => [
File["/srv/solr/cores/lib"], File["/srv/solr/cores/lib"],
Util::Extract::Tar["/usr/local/src/abusesa-search"], Util::Extract::Tar["/usr/local/src/abusesa-search"],
], ],
notify => Service["solr"],
} }
file { "/srv/solr/cores/lib/java-ipv6-0.8.jar": file { "/srv/solr/cores/lib/java-ipv6-0.8.jar":
ensure => present, ensure => present,
mode => "0660", mode => "0660",
owner => "solr", owner => "solr",
group => "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 => [ require => [
File["/srv/solr/cores/lib"], File["/srv/solr/cores/lib"],
Util::Extract::Tar["/usr/local/src/abusesa-search"], Util::Extract::Tar["/usr/local/src/abusesa-search"],
], ],
notify => Service["solr"],
} }
$htdocs = $::operatingsystem ? { $htdocs = $::operatingsystem ? {