From ce80b2d874e47ba3f2f179cde7290ef3d23b7713 Mon Sep 17 00:00:00 2001 From: Ossi Salmi Date: Fri, 14 Jun 2013 11:25:05 +0300 Subject: [PATCH] abusesa: Added template for abusesa search Config.js --- abusesa/manifests/init.pp | 13 +++++++++++++ abusesa/templates/Config.js.erb | 4 ++++ 2 files changed, 17 insertions(+) create mode 100644 abusesa/templates/Config.js.erb diff --git a/abusesa/manifests/init.pp b/abusesa/manifests/init.pp index 2d68982..b285fb5 100644 --- a/abusesa/manifests/init.pp +++ b/abusesa/manifests/init.pp @@ -100,6 +100,10 @@ class abusesa::search { } } + if !$abusesa_search_solrurl { + fail("Must define \$abusesa_search_solrurl") + } + file { "/usr/local/src/abusesa-search.tar.gz": ensure => present, mode => "0644", @@ -184,6 +188,15 @@ class abusesa::search { default => "/usr/share/abusesa-search/htdocs", } + file { "${htdocs}/js/Config.js": + ensure => present, + mode => "0644", + owner => "root", + group => "root", + content => template("abusesa/Config.js.erb"), + require => Python::Setup::Install["/usr/local/src/abusesa-search"], + } + define configwebhost($htdocs) { file { "/srv/www/https/${name}/search": ensure => link, diff --git a/abusesa/templates/Config.js.erb b/abusesa/templates/Config.js.erb new file mode 100644 index 0000000..ee9cdda --- /dev/null +++ b/abusesa/templates/Config.js.erb @@ -0,0 +1,4 @@ +var config = { + solrUrl: "<%= @abusesa_search_solrurl %>", + servlet: "admin/luke" +};