Download as
Browse Code »

Commit ff994c7b2f1b195be9b8ee91b5a517d15872c4a2

Authored by Daniela Feitosa
2 parents ae17c75a 38e1816c
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

Merge commit 'refs/merge-requests/138' of git://gitorious.org/noosfero/noosfero … 

…into merge-requests/138
Showing 4 changed files with 48 additions and 6 deletions   Show diff stats
debian/changelog
  Diff comments   View file @ff994c7
  1 +noosfero (0.35.2~1) unstable; urgency=low
  2 +
  3 + * Bugfixes version release
  4 + * Added missing Build dependencies to build in a clean chroot: rake, rails,
  5 + libferret-ruby, libwill-paginate-ruby, tango-icon-theme, rcov
  6 + * Noosfero needs a functioning MTA: added dependency on exim4 |
  7 + mail-transport-agent.
  8 + * /usr/share/dbconfig-common/scripts/noosfero/install/pgsql: run db:migrate
  9 + just after db:schema:load.
  10 + * etc/init.d/noosfero: forward fix for the Lenny → Squeeze upgrade. In
  11 + Squeeze, `rails` is an empty package that depends on rails-ruby1.8, but
  12 + rails-ruby1.8 is only unpacked *after* noosfero prerm runs. This way, the
  13 + initscript must be able to stop the services without any of the Rails
  14 + libraries available.
  15 +
  16 + -- Antonio Terceiro <terceiro@colivre.coop.br> Thu, 01 Mar 2012 14:37:15 -0300
  17 +
1 18 noosfero (0.35.1) unstable; urgency=low
2 19  
3 20 * Bugfixes version release
... ...
debian/control
  Diff comments   View file @ff994c7
... ... @@ -3,7 +3,7 @@ Section: web
3 3 Priority: extra
4 4 Maintainer: Noosfero developers <noosfero-dev@listas.softwarelivre.org>
5 5 Uploaders: Antonio Terceiro <terceiro@colivre.coop.br>
6   -Build-Depends: debhelper (>= 7.0.50~), po4a, libgettext-ruby-util, libgettext-ruby1.8, libsqlite3-ruby1.8,
  6 +Build-Depends: debhelper (>= 7.0.50~), po4a, libgettext-ruby-util, libgettext-ruby1.8, libsqlite3-ruby1.8, rake, rails, libferret-ruby, libwill-paginate-ruby, tango-icon-theme, rcov
7 7 Standards-Version: 3.8.4
8 8 Homepage: http://noosfero.org/
9 9 Vcs-Git: git://git.colivre.coop.br/noosfero.git
... ... @@ -11,7 +11,7 @@ Vcs-Browser: http://git.colivre.coop.br/?p=noosfero.git
11 11  
12 12 Package: noosfero
13 13 Architecture: all
14   -Depends: rails, ruby1.8, ruby, rake, libgettext-ruby-data, libsqlite3-ruby, libpgsql-ruby, libmysql-ruby, librmagick-ruby, libredcloth-ruby, libwill-paginate-ruby, iso-codes, libfeedparser-ruby, libferret-ruby, libdaemons-ruby, rcov, mongrel, mongrel-cluster, tango-icon-theme, libhpricot-ruby, iso-codes, memcached, debconf, dbconfig-common, postgresql, adduser, ${misc:Depends}
  14 +Depends: rails, ruby1.8, ruby, rake, libgettext-ruby-data, libsqlite3-ruby, libpgsql-ruby, libmysql-ruby, librmagick-ruby, libredcloth-ruby, libwill-paginate-ruby, iso-codes, libfeedparser-ruby, libferret-ruby, libdaemons-ruby, rcov, mongrel, mongrel-cluster, tango-icon-theme, libhpricot-ruby, iso-codes, memcached, debconf, dbconfig-common, postgresql, adduser, exim4 | mail-transport-agent, ${misc:Depends}
15 15 Recommends: postgresql-client
16 16 Description: free web-based platform for social networks
17 17 Noosfero is a web platform for social and solidarity economy networks with
... ...
debian/dbinstall
  Diff comments   View file @ff994c7
... ... @@ -8,4 +8,5 @@ sed -i -e &#39;s/adapter: pgsql/adapter: postgresql/&#39; /etc/noosfero/database.yml
8 8 /etc/init.d/noosfero setup
9 9  
10 10 cd /usr/share/noosfero && su noosfero -c "rake db:schema:load RAILS_ENV=production"
  11 +cd /usr/share/noosfero && su noosfero -c "rake db:migrate RAILS_ENV=production SCHEMA=/dev/null"
11 12 cd /usr/share/noosfero && su noosfero -c "rake db:data:minimal RAILS_ENV=production"
... ...
script/production
  Diff comments   View file @ff994c7
... ... @@ -37,10 +37,34 @@ do_start() {
37 37 }
38 38  
39 39 do_stop() {
40   - mongrel_rails cluster::stop
41   - ./script/delayed_job stop
42   - ./script/feed-updater stop
43   - ./script/ferret_server -e $RAILS_ENV stop
  40 +
  41 + # During Debian upgrades, it is possible that rails is not available (e.g.
  42 + # Lenny -> Squeeze), so the programs below might fail. If they do, we fall
  43 + # back to stopping the daemons by manually reading their PID files, killing
  44 + # them and wiping the PID files.
  45 +
  46 + mongrel_rails cluster::stop ||
  47 + stop_via_pid_file tmp/pids/mongrel.*.pid
  48 +
  49 + ./script/delayed_job stop ||
  50 + stop_via_pid_file tmp/pids/delayed_job.pid
  51 +
  52 + ./script/feed-updater stop ||
  53 + stop_via_pid_file tmp/pids/feed-updater.default.pid
  54 +
  55 + ./script/ferret_server -e $RAILS_ENV stop ||
  56 + stop_via_pid_file tmp/pids/ferret.production.pid
  57 +}
  58 +
  59 +stop_via_pid_file() {
  60 + for pidfile in $@; do
  61 + if [ -e "$pidfile" ]; then
  62 + pid=$(cat $pidfile)
  63 + echo "Sentign TERM signal to stop $pid ..."
  64 + kill -TERM "$pid"
  65 + rm -f $pidfile
  66 + fi
  67 + done
44 68 }
45 69  
46 70 environments_loop() {
... ...