diff --git a/Gemfile b/Gemfile index a8dc2a8..8b9613c 100755 --- a/Gemfile +++ b/Gemfile @@ -5,7 +5,7 @@ gem 'sprockets', '2.2.2' gem 'webrick', '1.3.1' # Bundle edge Rails instead: # gem 'rails', :git => 'git://github.com/rails/rails.git' - gem 'mysql2' + gem 'mysql2', '~>0.3.10' gem 'sqlite3' gem 'execjs', '~>1.4.0' @@ -136,4 +136,4 @@ gem 'blueimp-gallery-rails' gem 'shareable' -gem 'sunspot_test' \ No newline at end of file +gem 'sunspot_test' diff --git a/config/sunspot.yml b/config/sunspot.yml index 236e868..20d40e6 100644 --- a/config/sunspot.yml +++ b/config/sunspot.yml @@ -10,10 +10,15 @@ production: development: solr: - hostname: solr - port: 8983 + hostname: triton-amp.local + port: 8080 log_level: INFO path: /solr/mycore +# solr: +# hostname: localhost +# port: 8983 +# log_level: INFO +# path: /solr/mycore test: solr: