Download as
Browse Code »

Commit b01715be285bdce082e27a80796dcadb1df859a0

Authored by Antonio Terceiro
1 parent 96a2e91e
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

Don't start service without a proper DB config 

ActionItem2679
Showing 3 changed files with 29 additions and 0 deletions   Show diff stats
debian/noosfero-check-dbconfig 0 → 100755
  Diff comments   View file @b01715b
... ... @@ -0,0 +1,21 @@
  1 +#!/usr/bin/ruby
  2 +
  3 +require 'yaml'
  4 +
  5 +DBCONFIG = ARGV.first || '/etc/database/database.yml'
  6 +
  7 +$dbconfig = {}
  8 +
  9 +checks = [
  10 + lambda { File.exists?(DBCONFIG) },
  11 + lambda { $dbconfig = YAML.load_file(DBCONFIG) },
  12 + lambda { $dbconfig['production'] },
  13 + lambda { $dbconfig['production']['adapter'] },
  14 + lambda { $dbconfig['production']['database'] },
  15 +]
  16 +
  17 +if checks.all?(&:call)
  18 + exit 0
  19 +else
  20 + exit 1
  21 +end
... ...
debian/noosfero.install
  Diff comments   View file @b01715b
... ... @@ -38,3 +38,4 @@ locale usr/share/noosfero
38 38 doc/noosfero usr/share/noosfero/doc
39 39  
40 40 debian/noosfero-console usr/sbin
  41 +debian/noosfero-check-dbconfig usr/sbin
... ...
etc/init.d/noosfero
  Diff comments   View file @b01715b
... ... @@ -44,6 +44,13 @@ if [ -z "$NOOSFERO_DIR" ] || [ -z "$NOOSFERO_USER" ]; then
44 44 exit 0
45 45 fi
46 46  
  47 +if test -x /usr/sbin/noosfero-check-dbconfig ; then
  48 + if ! noosfero-check-dbconfig; then
  49 + echo "Noosfero database access not configured, service disabled."
  50 + exit 0
  51 + fi
  52 +fi
  53 +
47 54 ######################
48 55  
49 56 main_script() {
... ...