Skip to content
Permalink
Browse files

Update sunspot_solr config to version 2.1

This pulls in solr 4.2
  • Loading branch information...
nathanstitt committed Dec 12, 2013
1 parent 9aecbc1 commit 3ef4cba05983ce315c92620ea737b55a4e4fe910
Showing 568 changed files with 986 additions and 79,338 deletions.
@@ -14,12 +14,13 @@ raw
public/docs
public/asset_store
public/document-viewer/images/*.psd
solr/data
solr/collection1/data
*.swp
*~
.#*
cloud_crowd.db
.DS_Store
public/search
vendor/solr-4.0.0/solr-webapp/webapp/*
.bundle
.bundle

11 Gemfile
@@ -11,24 +11,25 @@ gem 'pg', '~> 0.17'

gem 'closure-compiler'
gem 'docsplit', '>= 0.6.4'
gem 'sunspot_rails', '~> 2.0'
gem 'sunspot_rails', '~> 2.1.0'
gem 'sunspot_solr', '~> 2.1.0'
gem 'progress_bar' # optional, used by sunspot to show progress while re-indexing
#gem 'cloud-crowd', '~> 0.7.0'
gem 'cloud-crowd', :git=>'https://github.com/nathanstitt/cloud-crowd.git', :branch=>'rails4'
gem 'cloud-crowd', :github=>'nathanstitt/cloud-crowd', :branch=>'rails4'
gem 'sqlite3'
gem 'pdftailor'
gem 'omniauth', '~> 1.1.4'
gem 'omniauth-twitter', '~> 1.0'
gem 'omniauth-facebook', '~> 1.4.1'
gem 'omniauth-google-oauth2', '~> 0.2.0'
gem 'sanitize', '~> 2.0.6'
gem 'sunspot_solr', '~> 2.0.0'
gem 'rdiscount', '~> 2.1.6'
gem 'right_http_connection'
gem 'rake'

gem 'jammit', :git=>'https://github.com/nathanstitt/jammit.git', :branch=>'rails4'
gem 'jammit', :github=>'nathanstitt/jammit', :branch=>'rails4'
gem 'nokogiri', '~> 1.6.0'
gem 'right_aws', '2.0.1', :git=>'https://github.com/documentcloud/right_aws.git' # Our patched version.
gem 'right_aws', '2.0.1', :github=>'documentcloud/right_aws' # Our patched version.


group :development, :test do
@@ -1,11 +1,11 @@
GIT
remote: https://github.com/documentcloud/right_aws.git
remote: git://github.com/documentcloud/right_aws.git
revision: 57beab61fac4a621614b67f2014ec879bac25890
specs:
right_aws (2.0.1)

GIT
remote: https://github.com/nathanstitt/cloud-crowd.git
remote: git://github.com/nathanstitt/cloud-crowd.git
revision: 765f50794291c06b211ef65883322cc93ca2bfe1
branch: rails4
specs:
@@ -17,7 +17,7 @@ GIT
thin (>= 1.2.4)

GIT
remote: https://github.com/nathanstitt/jammit.git
remote: git://github.com/nathanstitt/jammit.git
revision: a68e62ab3e6c2ed06029919bb059473d177777e6
branch: rails4
specs:
@@ -28,25 +28,25 @@ GIT
GEM
remote: https://rubygems.org/
specs:
actionmailer (4.0.1)
actionpack (= 4.0.1)
actionmailer (4.0.2)
actionpack (= 4.0.2)
mail (~> 2.5.4)
actionpack (4.0.1)
activesupport (= 4.0.1)
actionpack (4.0.2)
activesupport (= 4.0.2)
builder (~> 3.1.0)
erubis (~> 2.7.0)
rack (~> 1.5.2)
rack-test (~> 0.6.2)
activemodel (4.0.1)
activesupport (= 4.0.1)
activemodel (4.0.2)
activesupport (= 4.0.2)
builder (~> 3.1.0)
activerecord (4.0.1)
activemodel (= 4.0.1)
activerecord (4.0.2)
activemodel (= 4.0.2)
activerecord-deprecated_finders (~> 1.0.2)
activesupport (= 4.0.1)
activesupport (= 4.0.2)
arel (~> 4.0.0)
activerecord-deprecated_finders (1.0.3)
activesupport (4.0.1)
activesupport (4.0.2)
i18n (~> 0.6, >= 0.6.4)
minitest (~> 4.2)
multi_json (~> 1.3)
@@ -76,6 +76,7 @@ GEM
eventmachine (1.0.3)
faraday (0.8.8)
multipart-post (~> 1.2.0)
fattr (2.2.1)
ffi (1.9.3)
formatador (0.2.4)
growl (1.0.3)
@@ -92,9 +93,10 @@ GEM
guard (~> 2.0)
minitest (>= 3.0)
hashie (2.0.5)
highline (1.6.20)
hike (1.2.3)
httpauth (0.2.0)
i18n (0.6.5)
i18n (0.6.9)
iconv (1.0.3)
jsmin (1.0.1)
json (1.8.1)
@@ -143,10 +145,15 @@ GEM
omniauth-twitter (1.0.1)
multi_json (~> 1.3)
omniauth-oauth (~> 1.0)
options (2.3.0)
fattr
pdftailor (0.0.1)
pg (0.17.0)
polyglot (0.3.3)
pr_geohash (1.0.0)
progress_bar (1.0.0)
highline (~> 1.6.1)
options (~> 2.3.0)
pry (0.9.12.4)
coderay (~> 1.0)
method_source (~> 0.8)
@@ -156,17 +163,17 @@ GEM
rack
rack-test (0.6.2)
rack (>= 1.0)
rails (4.0.1)
actionmailer (= 4.0.1)
actionpack (= 4.0.1)
activerecord (= 4.0.1)
activesupport (= 4.0.1)
rails (4.0.2)
actionmailer (= 4.0.2)
actionpack (= 4.0.2)
activerecord (= 4.0.2)
activesupport (= 4.0.2)
bundler (>= 1.3.0, < 2.0)
railties (= 4.0.1)
railties (= 4.0.2)
sprockets-rails (~> 2.0.0)
railties (4.0.1)
actionpack (= 4.0.1)
activesupport (= 4.0.1)
railties (4.0.2)
actionpack (= 4.0.2)
activesupport (= 4.0.2)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rake (10.1.0)
@@ -206,7 +213,7 @@ GEM
nokogiri
rails (>= 3)
sunspot (= 2.1.0)
sunspot_solr (2.0.0)
sunspot_solr (2.1.0)
thin (1.6.1)
daemons (>= 1.0.9)
eventmachine (>= 1.0.0)
@@ -248,6 +255,7 @@ DEPENDENCIES
omniauth-twitter (~> 1.0)
pdftailor
pg (~> 0.17)
progress_bar
rails (~> 4.0)
rake
rdiscount (~> 2.1.6)
@@ -259,6 +267,6 @@ DEPENDENCIES
spring
sqlite3
sunspot_matchers
sunspot_rails (~> 2.0)
sunspot_solr (~> 2.0.0)
sunspot_rails (~> 2.1.0)
sunspot_solr (~> 2.1.0)
turn
@@ -1,37 +1,35 @@
development:
auto_commit_after_request: false
production:
solr:
hostname: localhost
hostname: ec2-23-20-237-32.compute-1.amazonaws.com
port: 7377
path: /solr/production
read_timeout: 2
open_timeout: 0.5
log_level: INFO
min_memory: 20M
max_memory: 500M
solr_jar: vendor/solr-4.0.0/start.jar
pid_dir: tmp/pids

staging:
auto_commit_after_request: false
development:
solr:
hostname: ec2-50-16-197-147.compute-1.amazonaws.com
hostname: localhost
port: 7377
log_level: WARNING
solr_jar: vendor/solr-4.0.0/start.jar
log_level: ALL
path: /solr/collection1
pid_dir: tmp/pids

production:
auto_commit_after_request: false
test:
solr:
hostname: ec2-23-20-237-32.compute-1.amazonaws.com
port: 7377
log_level: INFO
min_memory: 200M
max_memory: 3G
solr_jar: vendor/solr-4.0.0/start.jar
hostname: localhost
port: 8982
log_level: WARNING
path: /solr/collection1
pid_dir: tmp/pids

test:
staging:
solr:
hostname: localhost
port: 8981
hostname: ec2-50-16-197-147.compute-1.amazonaws.com
port: 7377
log_level: WARNING
pid_dir: tmp/pids
path: /solr/collection1
Binary file not shown.
Binary file not shown.

0 comments on commit 3ef4cba

Please sign in to comment.
You can’t perform that action at this time.