Download as
Browse Code »

Commit 89ec5ec1cc6fdbda6d0a6eb3759a4ea3ecee2789

Authored by Antonio Terceiro
1 parent 30499911
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

s/mongrel/thin/ in INSTALL

Showing 1 changed file with 8 additions and 8 deletions   Show diff stats
@@ -13,7 +13,7 @@ You need to install some packages Noosfero depends on. On Debian GNU/Linux or @@ -13,7 +13,7 @@ You need to install some packages Noosfero depends on. On Debian GNU/Linux or
13 Debian-based systems, all of these packages are available through the Debian 13 Debian-based systems, all of these packages are available through the Debian
14 archive. You can install them with the following command: 14 archive. You can install them with the following command:
15 15
16 - # apt-get install ruby rake po4a libgettext-ruby-util libgettext-ruby-data libgettext-ruby1.8 libsqlite3-ruby rcov librmagick-ruby libredcloth-ruby libwill-paginate-ruby iso-codes libfeedparser-ruby libferret-ruby libdaemons-ruby mongrel mongrel-cluster tango-icon-theme libhpricot-ruby 16 + # apt-get install ruby rake po4a libgettext-ruby-util libgettext-ruby-data libgettext-ruby1.8 libsqlite3-ruby rcov librmagick-ruby libredcloth-ruby libwill-paginate-ruby iso-codes libfeedparser-ruby libferret-ruby libdaemons-ruby thin tango-icon-theme libhpricot-ruby
17 17
18 On other systems, they may or may not be available through your regular package 18 On other systems, they may or may not be available through your regular package
19 management system. Below are the links to their homepages. 19 management system. Below are the links to their homepages.
@@ -31,7 +31,7 @@ management system. Below are the links to their homepages. @@ -31,7 +31,7 @@ management system. Below are the links to their homepages.
31 * iso-codes: http://pkg-isocodes.alioth.debian.org/ 31 * iso-codes: http://pkg-isocodes.alioth.debian.org/
32 * feedparser: http://packages.debian.org/sid/libfeedparser-ruby 32 * feedparser: http://packages.debian.org/sid/libfeedparser-ruby
33 * Daemons - http://daemons.rubyforge.org/ 33 * Daemons - http://daemons.rubyforge.org/
34 -* Mongrel: http://mongrel.rubyforge.org/ 34 +* Thin: http://code.macournoyer.com/thin/
35 * tango-icon-theme: http://tango.freedesktop.org/Tango_Icon_Library 35 * tango-icon-theme: http://tango.freedesktop.org/Tango_Icon_Library
36 * Hpricot: http://hpricot.com/ 36 * Hpricot: http://hpricot.com/
37 37
@@ -118,13 +118,13 @@ $ cd current @@ -118,13 +118,13 @@ $ cd current
118 Copy config/ferret_server.yml.dist to config/ferret_server.yml. You will 118 Copy config/ferret_server.yml.dist to config/ferret_server.yml. You will
119 probably not need to customize this configuration, but have a look at it. 119 probably not need to customize this configuration, but have a look at it.
120 120
121 -Create the mongrel configuration file: 121 +Create the thin configuration file:
122 122
123 -$ mongrel_rails cluster::configure 123 +$ thin -C config/thin.yml config
124 124
125 -Edit config/mongrel_cluster.yml to suit your needs. Make sure your apache  
126 -configuration matches the mongrel cluster configuration, specially in respect  
127 -to the ports and numbers of mongrel instances. 125 +Edit config/thin.yml to suit your needs. Make sure your apache
  126 +configuration matches the thin cluster configuration, specially in respect
  127 +to the ports and numbers of thin instances.
128 128
129 Note: currently Noosfero only supports Rails 2.1.0, which is the version in 129 Note: currently Noosfero only supports Rails 2.1.0, which is the version in
130 Debian Lenny. If you have a Rails version newer than that, Noosfero will 130 Debian Lenny. If you have a Rails version newer than that, Noosfero will
@@ -316,7 +316,7 @@ In other systems the way by which you enable apache modules may be different. @@ -316,7 +316,7 @@ In other systems the way by which you enable apache modules may be different.
316 Now with the Apache configuration. You can use the template below, replacing 316 Now with the Apache configuration. You can use the template below, replacing
317 /var/lib/noosfero/current with the directory in which your noosfero 317 /var/lib/noosfero/current with the directory in which your noosfero
318 installation is, your.domain.com with the domain name of your noosfero site. 318 installation is, your.domain.com with the domain name of your noosfero site.
319 -We are assuming that you are running two mongrel instances on ports 3000 and 319 +We are assuming that you are running two thin instances on ports 3000 and
320 3001. If your setup is different you'll need to adjust <Proxy> section. If you 320 3001. If your setup is different you'll need to adjust <Proxy> section. If you
321 don't understand something in the configuration, please refer to the apache 321 don't understand something in the configuration, please refer to the apache
322 documentation. 322 documentation.