From 11746612cadcc8a38afd77c6ebd5640cb2ffefbd Mon Sep 17 00:00:00 2001 From: enterteg Date: Tue, 29 Mar 2016 22:31:07 +0200 Subject: [PATCH] changed elasticsearch to algolia search --- Gemfile | 5 +- Gemfile.lock | 34 +- app/assets/javascripts/application.js | 7 +- app/assets/javascripts/posts.coffee.erb | 6 +- app/controllers/public_controller.rb | 3 +- app/models/post.rb | 6 +- app/views/layouts/application.html.haml | 6 +- app/views/posts/show.html.haml | 2 +- app/views/public/index.html.haml | 1 - config/initializers/algoliasearch.rb | 1 + .../sunspot/conf/_rest_managed.json | 1 + solr/configsets/sunspot/conf/admin-extra.html | 31 + solr/configsets/sunspot/conf/currency.xml | 67 ++ solr/configsets/sunspot/conf/elevate.xml | 36 + .../sunspot/conf/lang/stopwords_en.txt | 54 ++ .../sunspot/conf/mapping-ISOLatin1Accent.txt | 246 +++++++ solr/configsets/sunspot/conf/protwords.txt | 21 + solr/configsets/sunspot/conf/schema.xml | 278 ++++++++ solr/configsets/sunspot/conf/scripts.conf | 24 + solr/configsets/sunspot/conf/solrconfig.xml | 631 ++++++++++++++++++ solr/configsets/sunspot/conf/spellings.txt | 2 + solr/configsets/sunspot/conf/synonyms.txt | 29 + solr/default/core.properties | 3 + solr/default/data/index/segments_1 | Bin 0 -> 71 bytes solr/default/data/index/write.lock | 0 solr/development/core.properties | 3 + solr/development/data/index/segments_1 | Bin 0 -> 71 bytes solr/development/data/index/write.lock | 0 .../development/sunspot-solr-development.pid | 1 + solr/solr.xml | 51 ++ solr/test/core.properties | 3 + solr/test/data/index/segments_1 | Bin 0 -> 71 bytes solr/test/data/index/write.lock | 0 33 files changed, 1512 insertions(+), 40 deletions(-) create mode 100644 config/initializers/algoliasearch.rb create mode 100644 solr/configsets/sunspot/conf/_rest_managed.json create mode 100644 solr/configsets/sunspot/conf/admin-extra.html create mode 100644 solr/configsets/sunspot/conf/currency.xml create mode 100644 solr/configsets/sunspot/conf/elevate.xml create mode 100644 solr/configsets/sunspot/conf/lang/stopwords_en.txt create mode 100644 solr/configsets/sunspot/conf/mapping-ISOLatin1Accent.txt create mode 100644 solr/configsets/sunspot/conf/protwords.txt create mode 100644 solr/configsets/sunspot/conf/schema.xml create mode 100644 solr/configsets/sunspot/conf/scripts.conf create mode 100644 solr/configsets/sunspot/conf/solrconfig.xml create mode 100644 solr/configsets/sunspot/conf/spellings.txt create mode 100644 solr/configsets/sunspot/conf/synonyms.txt create mode 100644 solr/default/core.properties create mode 100644 solr/default/data/index/segments_1 create mode 100644 solr/default/data/index/write.lock create mode 100644 solr/development/core.properties create mode 100644 solr/development/data/index/segments_1 create mode 100644 solr/development/data/index/write.lock create mode 100644 solr/pids/development/sunspot-solr-development.pid create mode 100644 solr/solr.xml create mode 100644 solr/test/core.properties create mode 100644 solr/test/data/index/segments_1 create mode 100644 solr/test/data/index/write.lock diff --git a/Gemfile b/Gemfile index aba15f4..fc1c09b 100644 --- a/Gemfile +++ b/Gemfile @@ -13,10 +13,7 @@ gem 'tinymce-rails' gem 'truncate_html', '~> 0.9.3' gem 'lightbox2-rails' gem 'will_paginate', '~> 3.0.6' -gem 'searchkick' -gem 'elasticsearch-model' -gem 'elasticsearch-rails' -gem 'bonsai-elasticsearch-rails' +gem "algoliasearch-rails" gem 'responders', '~> 2.0' #----------------- diff --git a/Gemfile.lock b/Gemfile.lock index 28db672..bab426a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -36,6 +36,12 @@ GEM minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) + algoliasearch (1.7.0) + httpclient (~> 2.4) + json (>= 1.5.1) + algoliasearch-rails (1.14.1) + algoliasearch (>= 1.2.14) + json (>= 1.5.1) arel (6.0.3) attachinary (1.3.1) cloudinary (~> 1.1.0) @@ -44,7 +50,6 @@ GEM bcrypt (3.1.11) binding_of_caller (0.7.2) debug_inspector (>= 0.0.1) - bonsai-elasticsearch-rails (0.0.4) builder (3.2.2) byebug (8.2.2) cloudinary (1.1.4) @@ -61,30 +66,15 @@ GEM debug_inspector (0.0.2) domain_name (0.5.20160310) unf (>= 0.0.5, < 1.0.0) - elasticsearch (1.0.15) - elasticsearch-api (= 1.0.15) - elasticsearch-transport (= 1.0.15) - elasticsearch-api (1.0.15) - multi_json - elasticsearch-model (0.1.8) - activesupport (> 3) - elasticsearch (> 0.4) - hashie - elasticsearch-rails (0.1.8) - elasticsearch-transport (1.0.15) - faraday - multi_json erubis (2.7.0) execjs (2.6.0) - faraday (0.9.2) - multipart-post (>= 1.2, < 3) globalid (0.3.6) activesupport (>= 4.1.0) haml (4.0.7) tilt - hashie (3.4.3) http-cookie (1.0.2) domain_name (~> 0.5) + httpclient (2.7.1) i18n (0.7.0) jbuilder (2.4.1) activesupport (>= 3.0.0, < 5.1) @@ -104,7 +94,6 @@ GEM mini_portile2 (2.0.0) minitest (5.8.4) multi_json (1.11.2) - multipart-post (2.0.0) netrc (0.11.0) nokogiri (1.6.7.2) mini_portile2 (~> 2.0.0.rc2) @@ -160,10 +149,6 @@ GEM sdoc (0.4.1) json (~> 1.7, >= 1.7.7) rdoc (~> 4.0) - searchkick (1.2.1) - activemodel - elasticsearch (>= 1) - hashie spring (1.6.4) sprockets (3.5.2) concurrent-ruby (~> 1.0) @@ -199,14 +184,12 @@ PLATFORMS ruby DEPENDENCIES + algoliasearch-rails attachinary bcrypt (~> 3.1.7) - bonsai-elasticsearch-rails byebug cloudinary coffee-rails (~> 4.1.0) - elasticsearch-model - elasticsearch-rails haml (~> 4.0, >= 4.0.7) jbuilder (~> 2.0) jquery-rails @@ -217,7 +200,6 @@ DEPENDENCIES responders (~> 2.0) sass-rails (~> 5.0) sdoc (~> 0.4.0) - searchkick spring tinymce-rails truncate_html (~> 0.9.3) diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index 5aaaf29..7292e5c 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -13,14 +13,17 @@ //= require jquery //= require jquery_ujs +//= require algolia/algoliasearch.min + //= require jquery.ui.widget //= require jquery.iframe-transport //= require jquery.fileupload //= require cloudinary/jquery.cloudinary //= require attachinary - -//= require turbolinks //= require tinymce + //= require lightbox + +//= require turbolinks //= require_tree . diff --git a/app/assets/javascripts/posts.coffee.erb b/app/assets/javascripts/posts.coffee.erb index 4c1474c..d62459a 100644 --- a/app/assets/javascripts/posts.coffee.erb +++ b/app/assets/javascripts/posts.coffee.erb @@ -58,7 +58,8 @@ set_map = -> $('#map_form').fadeOut() $ -> - $('.attachinary-input').attachinary() + if $('.attachinary-input') + $('.attachinary-input').attachinary() set_map() tinyMCE.init { selector: 'textarea#post_desc', @@ -68,7 +69,8 @@ $ -> $(document).on 'page:load', -> - $('.attachinary-input').attachinary() + if $('.attachinary-input') + $('.attachinary-input').attachinary() set_map() tinyMCE.init { selector: 'textarea#post_desc', diff --git a/app/controllers/public_controller.rb b/app/controllers/public_controller.rb index a2ab72e..ca1a2f2 100644 --- a/app/controllers/public_controller.rb +++ b/app/controllers/public_controller.rb @@ -31,7 +31,8 @@ def about def search @controller = 'search' if params[:search].present? - @posts = Post.paginate_it(params[:page]).search(params[:search]) + @posts = Post.includes(:photo_files).search(params[:search], hitsPerPage: 5) + p else redirect_to action: :index end diff --git a/app/models/post.rb b/app/models/post.rb index 84e99c2..7c3c1a9 100644 --- a/app/models/post.rb +++ b/app/models/post.rb @@ -1,6 +1,10 @@ class Post < ActiveRecord::Base - searchkick + include AlgoliaSearch + algoliasearch do + attribute :title, :desc + end + validate :validate_travel_pin belongs_to :category has_attachments :photos, maximum: 30 diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index 6b5d2a7..cb68881 100644 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -34,7 +34,7 @@ - else .search = form_tag search_path, method: :get do - = text_field_tag :search + = text_field_tag :search,'', id: 'search' = submit_tag 'Search' / - else / .social @@ -55,4 +55,6 @@ - if flash[:notice] #notice = flash[:notice] - = yield \ No newline at end of file + = yield + + \ No newline at end of file diff --git a/app/views/posts/show.html.haml b/app/views/posts/show.html.haml index 3cd65e5..e1742aa 100644 --- a/app/views/posts/show.html.haml +++ b/app/views/posts/show.html.haml @@ -13,7 +13,7 @@ .photos -@post.photos.each do |photo| = link_to (cloudinary_url photo.path), data: {lightbox: 'example-set'} do - = cl_image_tag photo.path, size: '300x170', crop: :fill + = cl_image_tag photo.path, size: '240x130', crop: :fill .clear = link_to :back do diff --git a/app/views/public/index.html.haml b/app/views/public/index.html.haml index 002fab0..cfc1e6e 100644 --- a/app/views/public/index.html.haml +++ b/app/views/public/index.html.haml @@ -29,4 +29,3 @@ = render @posts = will_paginate @posts, previous_label: 'prev', next_label: 'older posts', inner_window: 1, outer_window: 1 - \ No newline at end of file diff --git a/config/initializers/algoliasearch.rb b/config/initializers/algoliasearch.rb new file mode 100644 index 0000000..77ac1fd --- /dev/null +++ b/config/initializers/algoliasearch.rb @@ -0,0 +1 @@ +AlgoliaSearch.configuration = { application_id: 'SQGFP5WYEF', api_key: '9a56d49162d6bad282c6284088e1177a', pagination_backend: :will_paginate } \ No newline at end of file diff --git a/solr/configsets/sunspot/conf/_rest_managed.json b/solr/configsets/sunspot/conf/_rest_managed.json new file mode 100644 index 0000000..6a4aec3 --- /dev/null +++ b/solr/configsets/sunspot/conf/_rest_managed.json @@ -0,0 +1 @@ +{"initArgs":{},"managedList":[]} diff --git a/solr/configsets/sunspot/conf/admin-extra.html b/solr/configsets/sunspot/conf/admin-extra.html new file mode 100644 index 0000000..aa739da --- /dev/null +++ b/solr/configsets/sunspot/conf/admin-extra.html @@ -0,0 +1,31 @@ + + + diff --git a/solr/configsets/sunspot/conf/currency.xml b/solr/configsets/sunspot/conf/currency.xml new file mode 100644 index 0000000..3a9c58a --- /dev/null +++ b/solr/configsets/sunspot/conf/currency.xml @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/solr/configsets/sunspot/conf/elevate.xml b/solr/configsets/sunspot/conf/elevate.xml new file mode 100644 index 0000000..7630ebe --- /dev/null +++ b/solr/configsets/sunspot/conf/elevate.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + diff --git a/solr/configsets/sunspot/conf/lang/stopwords_en.txt b/solr/configsets/sunspot/conf/lang/stopwords_en.txt new file mode 100644 index 0000000..2c164c0 --- /dev/null +++ b/solr/configsets/sunspot/conf/lang/stopwords_en.txt @@ -0,0 +1,54 @@ +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +# a couple of test stopwords to test that the words are really being +# configured from this file: +stopworda +stopwordb + +# Standard english stop words taken from Lucene's StopAnalyzer +a +an +and +are +as +at +be +but +by +for +if +in +into +is +it +no +not +of +on +or +such +that +the +their +then +there +these +they +this +to +was +will +with diff --git a/solr/configsets/sunspot/conf/mapping-ISOLatin1Accent.txt b/solr/configsets/sunspot/conf/mapping-ISOLatin1Accent.txt new file mode 100644 index 0000000..ede7742 --- /dev/null +++ b/solr/configsets/sunspot/conf/mapping-ISOLatin1Accent.txt @@ -0,0 +1,246 @@ +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +# Syntax: +# "source" => "target" +# "source".length() > 0 (source cannot be empty.) +# "target".length() >= 0 (target can be empty.) + +# example: +# "À" => "A" +# "\u00C0" => "A" +# "\u00C0" => "\u0041" +# "ß" => "ss" +# "\t" => " " +# "\n" => "" + +# À => A +"\u00C0" => "A" + +# Á => A +"\u00C1" => "A" + +#  => A +"\u00C2" => "A" + +# à => A +"\u00C3" => "A" + +# Ä => A +"\u00C4" => "A" + +# Å => A +"\u00C5" => "A" + +# Æ => AE +"\u00C6" => "AE" + +# Ç => C +"\u00C7" => "C" + +# È => E +"\u00C8" => "E" + +# É => E +"\u00C9" => "E" + +# Ê => E +"\u00CA" => "E" + +# Ë => E +"\u00CB" => "E" + +# Ì => I +"\u00CC" => "I" + +# Í => I +"\u00CD" => "I" + +# Î => I +"\u00CE" => "I" + +# Ï => I +"\u00CF" => "I" + +# IJ => IJ +"\u0132" => "IJ" + +# Ð => D +"\u00D0" => "D" + +# Ñ => N +"\u00D1" => "N" + +# Ò => O +"\u00D2" => "O" + +# Ó => O +"\u00D3" => "O" + +# Ô => O +"\u00D4" => "O" + +# Õ => O +"\u00D5" => "O" + +# Ö => O +"\u00D6" => "O" + +# Ø => O +"\u00D8" => "O" + +# Œ => OE +"\u0152" => "OE" + +# Þ +"\u00DE" => "TH" + +# Ù => U +"\u00D9" => "U" + +# Ú => U +"\u00DA" => "U" + +# Û => U +"\u00DB" => "U" + +# Ü => U +"\u00DC" => "U" + +# Ý => Y +"\u00DD" => "Y" + +# Ÿ => Y +"\u0178" => "Y" + +# à => a +"\u00E0" => "a" + +# á => a +"\u00E1" => "a" + +# â => a +"\u00E2" => "a" + +# ã => a +"\u00E3" => "a" + +# ä => a +"\u00E4" => "a" + +# å => a +"\u00E5" => "a" + +# æ => ae +"\u00E6" => "ae" + +# ç => c +"\u00E7" => "c" + +# è => e +"\u00E8" => "e" + +# é => e +"\u00E9" => "e" + +# ê => e +"\u00EA" => "e" + +# ë => e +"\u00EB" => "e" + +# ì => i +"\u00EC" => "i" + +# í => i +"\u00ED" => "i" + +# î => i +"\u00EE" => "i" + +# ï => i +"\u00EF" => "i" + +# ij => ij +"\u0133" => "ij" + +# ð => d +"\u00F0" => "d" + +# ñ => n +"\u00F1" => "n" + +# ò => o +"\u00F2" => "o" + +# ó => o +"\u00F3" => "o" + +# ô => o +"\u00F4" => "o" + +# õ => o +"\u00F5" => "o" + +# ö => o +"\u00F6" => "o" + +# ø => o +"\u00F8" => "o" + +# œ => oe +"\u0153" => "oe" + +# ß => ss +"\u00DF" => "ss" + +# þ => th +"\u00FE" => "th" + +# ù => u +"\u00F9" => "u" + +# ú => u +"\u00FA" => "u" + +# û => u +"\u00FB" => "u" + +# ü => u +"\u00FC" => "u" + +# ý => y +"\u00FD" => "y" + +# ÿ => y +"\u00FF" => "y" + +# ff => ff +"\uFB00" => "ff" + +# fi => fi +"\uFB01" => "fi" + +# fl => fl +"\uFB02" => "fl" + +# ffi => ffi +"\uFB03" => "ffi" + +# ffl => ffl +"\uFB04" => "ffl" + +# ſt => ft +"\uFB05" => "ft" + +# st => st +"\uFB06" => "st" diff --git a/solr/configsets/sunspot/conf/protwords.txt b/solr/configsets/sunspot/conf/protwords.txt new file mode 100644 index 0000000..1dfc0ab --- /dev/null +++ b/solr/configsets/sunspot/conf/protwords.txt @@ -0,0 +1,21 @@ +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +#----------------------------------------------------------------------- +# Use a protected word file to protect against the stemmer reducing two +# unrelated words to the same base word. + +# Some non-words that normally won't be encountered, +# just to test that they won't be stemmed. +dontstems +zwhacky + diff --git a/solr/configsets/sunspot/conf/schema.xml b/solr/configsets/sunspot/conf/schema.xml new file mode 100644 index 0000000..9777c11 --- /dev/null +++ b/solr/configsets/sunspot/conf/schema.xml @@ -0,0 +1,278 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + id + + text + + + + + + + + diff --git a/solr/configsets/sunspot/conf/scripts.conf b/solr/configsets/sunspot/conf/scripts.conf new file mode 100644 index 0000000..f58b262 --- /dev/null +++ b/solr/configsets/sunspot/conf/scripts.conf @@ -0,0 +1,24 @@ +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +user= +solr_hostname=localhost +solr_port=8983 +rsyncd_port=18983 +data_dir= +webapp_name=solr +master_host= +master_data_dir= +master_status_dir= diff --git a/solr/configsets/sunspot/conf/solrconfig.xml b/solr/configsets/sunspot/conf/solrconfig.xml new file mode 100644 index 0000000..6881528 --- /dev/null +++ b/solr/configsets/sunspot/conf/solrconfig.xml @@ -0,0 +1,631 @@ + + + + + + + + + 5.0.0 + + + ${solr.data.dir:} + + + + + + + + + + + + + + + + ${solr.lock.type:native} + + + true + + + + + + + + + + + + + + + + ${solr.ulog.dir:} + + + + + ${solr.autoCommit.maxTime:15000} + false + + + + + ${solr.autoSoftCommit.maxTime:-1} + + + + + + + + 1024 + + + + + + + + + + + + + + + + + + true + + + 20 + + + 200 + + + false + + + 2 + + + + + + + + + + + + + + + + + + + default + true + true + + + spellcheck + + + + + + + explicit + json + true + text + + + spellcheck + + + + + + + {!xport} + xsort + false + + + + query + + + + + + + text + + + + + + + + + + + + + + explicit + true + + + + + + textSpell + + + + default + + textSpell + true + + + + example + title_text + true + solr.DirectSolrSpellChecker + + internal + + 0.5 + + 2 + + 1 + + 5 + + 4 + + 0.01 + + + + + + wordbreak + solr.WordBreakSolrSpellChecker + name + true + true + 10 + + --> + + + + + + + + + + + true + false + + + terms + + + + + + 1 + 2 + + + + + + *:* + + + diff --git a/solr/configsets/sunspot/conf/spellings.txt b/solr/configsets/sunspot/conf/spellings.txt new file mode 100644 index 0000000..d7ede6f --- /dev/null +++ b/solr/configsets/sunspot/conf/spellings.txt @@ -0,0 +1,2 @@ +pizza +history \ No newline at end of file diff --git a/solr/configsets/sunspot/conf/synonyms.txt b/solr/configsets/sunspot/conf/synonyms.txt new file mode 100644 index 0000000..7f72128 --- /dev/null +++ b/solr/configsets/sunspot/conf/synonyms.txt @@ -0,0 +1,29 @@ +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +#----------------------------------------------------------------------- +#some test synonym mappings unlikely to appear in real input text +aaafoo => aaabar +bbbfoo => bbbfoo bbbbar +cccfoo => cccbar cccbaz +fooaaa,baraaa,bazaaa + +# Some synonym groups specific to this example +GB,gib,gigabyte,gigabytes +MB,mib,megabyte,megabytes +Television, Televisions, TV, TVs +#notice we use "gib" instead of "GiB" so any WordDelimiterFilter coming +#after us won't split it into two words. + +# Synonym mappings can be used for spelling correction too +pixima => pixma + diff --git a/solr/default/core.properties b/solr/default/core.properties new file mode 100644 index 0000000..629f4bc --- /dev/null +++ b/solr/default/core.properties @@ -0,0 +1,3 @@ +name=default +configSet=sunspot +dataDir=./data diff --git a/solr/default/data/index/segments_1 b/solr/default/data/index/segments_1 new file mode 100644 index 0000000000000000000000000000000000000000..5065666f97af293bec27c9b5a1e04e9d9075fd28 GIT binary patch literal 71 zcmcD&o+HjtoSL4SnpaZHz`($!d_smlZeMTLvfnmot2dlsWHe-DW&}!r0271)k_R*< MzkqQbta5w?0NUIV6951J literal 0 HcmV?d00001 diff --git a/solr/default/data/index/write.lock b/solr/default/data/index/write.lock new file mode 100644 index 0000000..e69de29 diff --git a/solr/development/core.properties b/solr/development/core.properties new file mode 100644 index 0000000..1e1db35 --- /dev/null +++ b/solr/development/core.properties @@ -0,0 +1,3 @@ +name=development +configSet=sunspot +dataDir=./data diff --git a/solr/development/data/index/segments_1 b/solr/development/data/index/segments_1 new file mode 100644 index 0000000000000000000000000000000000000000..961c98bf8c2d45a3ab738946d2a3fb29ecc58a70 GIT binary patch literal 71 zcmcD&o+HjtoSL4SnpaZHz`($!d_smlZeMTLvfnmot2dnf&uGZX%m|bK0VW6qBoAmz MegWfr?Aosd00Eg2!vFvP literal 0 HcmV?d00001 diff --git a/solr/development/data/index/write.lock b/solr/development/data/index/write.lock new file mode 100644 index 0000000..e69de29 diff --git a/solr/pids/development/sunspot-solr-development.pid b/solr/pids/development/sunspot-solr-development.pid new file mode 100644 index 0000000..88989d8 --- /dev/null +++ b/solr/pids/development/sunspot-solr-development.pid @@ -0,0 +1 @@ +7410 \ No newline at end of file diff --git a/solr/solr.xml b/solr/solr.xml new file mode 100644 index 0000000..e247452 --- /dev/null +++ b/solr/solr.xml @@ -0,0 +1,51 @@ + + + + + + + + + + ${host:} + ${jetty.port:8983} + ${hostContext:solr} + + ${genericCoreNodeNames:true} + + ${zkClientTimeout:30000} + ${distribUpdateSoTimeout:600000} + ${distribUpdateConnTimeout:60000} + + + + + ${socketTimeout:600000} + ${connTimeout:60000} + + + diff --git a/solr/test/core.properties b/solr/test/core.properties new file mode 100644 index 0000000..e1221d1 --- /dev/null +++ b/solr/test/core.properties @@ -0,0 +1,3 @@ +name=test +configSet=sunspot +dataDir=./data diff --git a/solr/test/data/index/segments_1 b/solr/test/data/index/segments_1 new file mode 100644 index 0000000000000000000000000000000000000000..dff0590769b027c799bebc099fa4cfc3e1e621f3 GIT binary patch literal 71 zcmcD&o+HjtoSL4SnpaZHz`($!d_smlZeMTLvfnmot2dlsU^HZ9W&}!r0271)k_R*< MzkqSx`K~kv0NM8ud;kCd literal 0 HcmV?d00001 diff --git a/solr/test/data/index/write.lock b/solr/test/data/index/write.lock new file mode 100644 index 0000000..e69de29