diff --git a/HACKING.rails235 b/HACKING.rails235 index 8418cbc..f2b756e 100644 --- a/HACKING.rails235 +++ b/HACKING.rails235 @@ -4,7 +4,6 @@ development. Install dependencies: gem install rails -v 2.3.5 -gem install ferret gem install i18n gem install will_paginate -v 2.3.12 gem install cucumber diff --git a/INSTALL.multitenancy b/INSTALL.multitenancy index 49aa2cf..85bb519 100644 --- a/INSTALL.multitenancy +++ b/INSTALL.multitenancy @@ -20,7 +20,7 @@ The items below are separated for each hosted environment: * Uploaded files * Database -* Ferret index +* Solr index * ActiveRecord#cache_key * Feed updater * Delayed Job Workers @@ -116,9 +116,9 @@ Run Noosfero init file as root: # invoke-rc.d noosfero start -== Ferret +== Solr -It's necessary to run only one instance of ferret_server. Don't worry +It's necessary to run only one instance of Solr. Don't worry about this, Noosfero initializer had already done this for you. == Feed updater & Delayed job @@ -140,7 +140,7 @@ by following the steps below in addition to the previous steps: 1. Reindex your database -Rebuild the Ferret index by running the following task just +Rebuild the Solr index by running the following task just for your hosting environment, do this as noosfero user: $ RAILS_ENV=production rake multitenancy:reindex diff --git a/debian/control b/debian/control index 9e5b988..0ecff53 100644 --- a/debian/control +++ b/debian/control @@ -12,7 +12,7 @@ Build-Depends: rake, rails (>= 2.3.5-1~), rails-ruby1.8 (>= 2.3.5-1~), - libferret-ruby, + openjdk-6-jre, libwill-paginate-ruby, tango-icon-theme, rcov diff --git a/gitignore.example b/gitignore.example index aef77df..85abad2 100644 --- a/gitignore.example +++ b/gitignore.example @@ -7,7 +7,6 @@ tmp config/database.yml config/session.secret config/noosfero.yml -config/ferret_server.yml config/mongrel_cluster.yml config/solr.yml config/plugins -- libgit2 0.21.2