Merge branch 'release/v3.0.3'

cdr-stats · Sep 29, 2015 · 9f1a83c · 9f1a83c
2 parents f03ebe2 + 9f666ff
commit 9f1a83c
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/cdr_stats/cdr_stats/__init__.py b/cdr_stats/cdr_stats/__init__.py
@@ -16,7 +16,7 @@
 
 # :copyright: (c) 2011-2015 by Arezqui Belaid.
 # :license: MPL 2.0, see COPYING for more details.
-VERSION = '3.0.2'
+VERSION = '3.0.3'
 
 __version__ = VERSION
 __author__ = "Arezqui Belaid"

diff --git a/cdr_stats/frontend/views.py b/cdr_stats/frontend/views.py
@@ -82,7 +82,7 @@ def diagnostic(request):
         (total_cdr, not_imported_cdr) = (0, 0)
 
     if not conn_status:
-        error_msg = _("Please review the 'DATABASES' settings in the config file (/usr/share/cdrstats/settings_local.py). Make sure that the Database `CDR-Pusher` is created.")
+        error_msg = _("Please review the 'DATABASES' settings in the config file (/usr/share/cdrstats/cdr_stats/settings_local.py). Make sure that the Database `CDR-Pusher` is created.")
         info_msg = _("After changes in your 'settings_local.py' conf file, you will need to restart celery: $ /etc/init.d/cdr-stats-celeryd restart")
 
     conn_report = OrderedDict([

diff --git a/docs/source/configuration/configuration-country-reporting.rst b/docs/source/configuration/configuration-country-reporting.rst
@@ -16,7 +16,7 @@ prefixed with the international dial code.
 
 There is a facility for manipulating the dialled digits reported in the call
 detail records, as well as identifying calls as internal calls. This is done
-in the "general" section of /usr/share/cdrstats/settings_local.py.
+in the "general" section of /usr/share/cdrstats/cdr_stats/settings_local.py.
 
 
 1. Prefix Limits

diff --git a/docs/source/configuration/configuration-file.rst b/docs/source/configuration/configuration-file.rst
@@ -106,7 +106,7 @@ Mail server
 -----------
 
 To configure the SMTP client so that reports and alerts are sent via email,
-edit /usr/share/cdrstats/settings_local.py, and identify the email section::
+edit /usr/share/cdrstats/cdr_stats/settings_local.py, and identify the email section::
 
     #EMAIL BACKEND
     #=============

diff --git a/install/cdr-stats-functions.sh b/install/cdr-stats-functions.sh
@@ -557,8 +557,8 @@ func_create_pgsql_database(){
     sudo -u postgres createdb $CDRPUSHER_DBNAME
 
     echo "Grant all privileges to user..."
-    sudo -u postgres psql --command="GRANT ALL PRIVILEGES on database $DATABASENAME to $DB_USERNAME;"
-    sudo -u postgres psql --command="GRANT ALL PRIVILEGES on database $CDRPUSHER_DBNAME to $DB_USERNAME;"
+    sudo -u postgres psql --command="GRANT ALL PRIVILEGES on database \"$DATABASENAME\" to \"$DB_USERNAME\";"
+    sudo -u postgres psql --command="GRANT ALL PRIVILEGES on database \"$CDRPUSHER_DBNAME\" to \"$DB_USERNAME\";"
 }
 
 #NGINX / SUPERVISOR