Download as
Browse Code »

Commit 62193d8b230da7ff83dd32c96efc462974b5c74b

Authored by Rodrigo Souto
2 parents 7b739042 948cf621
Exists in staging and in 31 other branches all_pending_tasks_api, api-articles-period, api_roles, comments_permissions, elasticsearch, elasticsearch_api, elasticsearch_categories, elasticsearch_filter, elasticsearch_sort, elasticsearch_to_merge, elasticsearch_view, environment-exposes-api, export-comment-api, export_data, external_followers, federation-webfinger, federation_followers, federation_followers_backend, federation_oauth_provider, federation_webfinger, fix_notification_email, follower_permition, master, master_profile_followers, oauth_external_login, oauth_login, private-scraps, private-scraps-rebase, production, profile_api_improvements, user_mention

Merge branch 'noosfero-chat-db-dependency' into 'master' 

noosfero-chat: avoid psql command if postgresql is not installed



See merge request !830
Showing 1 changed file with 9 additions and 2 deletions   Show diff stats
debian/noosfero-chat.postinst
  Diff comments   View file @62193d8
... ... @@ -21,10 +21,17 @@ echo " [database = $noosfero_database]"
21 21 echo 'Creating ejabberd schema ...'
22 22 . /etc/default/noosfero
23 23 noosfero_user="$NOOSFERO_USER"
24   -su - postgres -c "psql -c 'GRANT CREATE ON DATABASE $noosfero_database TO $noosfero_user;' > /dev/null"
  24 +
  25 +if dpkg -s postgresql &> /dev/null ; then
  26 + su - postgres -c "psql -c 'GRANT CREATE ON DATABASE $noosfero_database TO $noosfero_user;' > /dev/null"
  27 +else
  28 + echo "[W]: No postgres installed. You're probably using noosfero's database in another machine. Make sure user $noosfero_user has CREATE permissions on $noosfero_database database by running:"
  29 + echo " => GRANT CREATE ON DATABASE $noosfero_database TO $noosfero_user;"
  30 +fi
  31 +
25 32 su - $noosfero_user -c 'rails dbconsole production < /usr/share/noosfero/util/chat/postgresql/ejabberd.sql > /dev/null'
26 33  
27   -if which update-noosfero-odbc > /dev/null ; then
  34 +if which update-noosfero-odbc &> /dev/null ; then
28 35 update-noosfero-odbc
29 36 fi
30 37  
... ...