Download as
Browse Code »

Commit 8e9c9d70faec534efc780675b1f54cf18e04220c

Authored by Rodrigo Souto
2 parents e61a0cba b01715be
Exists in master and in 28 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, stable, temp_ratings, tests, tests_fixies

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

…into merge-requests/326
Showing 3 changed files with 29 additions and 0 deletions   Show diff stats
debian/noosfero-check-dbconfig 0 → 100755
  Diff comments   View file @8e9c9d7
... ... @@ -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 @8e9c9d7
... ... @@ -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 @8e9c9d7
... ... @@ -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() {
... ...