[sr-dev] git:master: p_userloc Fixing the database URLs as entities

Olle E. Johansson oej at edvina.net
Sun Oct 14 21:04:13 CEST 2012


Module: sip-router
Branch: master
Commit: a86074046ebf5e325413662d099711c00ee24930
URL:    http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a86074046ebf5e325413662d099711c00ee24930

Author: Olle E. Johansson <oej at edvina.net>
Committer: Olle E. Johansson <oej at edvina.net>
Date:   Sun Oct 14 21:02:52 2012 +0200

p_userloc Fixing the database URLs as entities

---

 modules_k/p_usrloc/README                 |   21 ++++++++++-----------
 modules_k/p_usrloc/doc/p_usrloc_admin.xml |   20 +++++++++-----------
 2 files changed, 19 insertions(+), 22 deletions(-)

diff --git a/modules_k/p_usrloc/README b/modules_k/p_usrloc/README
index fb859d2..6736b43 100644
--- a/modules_k/p_usrloc/README
+++ b/modules_k/p_usrloc/README
@@ -25,7 +25,7 @@ Marius Zbihlei
               2.1. Kamailio Modules
               2.2. External Libraries or Applications
 
-        3. Exported Parameters
+        3. Parameters
 
               3.1. write_db_url (string)
               3.2. read_db_url (string)
@@ -131,7 +131,7 @@ Chapter 1. User's Guide
         2.1. Kamailio Modules
         2.2. External Libraries or Applications
 
-   3. Exported Parameters
+   3. Parameters
 
         3.1. write_db_url (string)
         3.2. read_db_url (string)
@@ -245,7 +245,7 @@ Warning
    running Kamailio with this module loaded:
      * None.
 
-3. Exported Parameters
+3. Parameters
 
    3.1. write_db_url (string)
    3.2. read_db_url (string)
@@ -275,12 +275,12 @@ Warning
 
    The url to the master database where errors are written to.
 
-   Default value is "mysql://openser:openserrw@localhost/openser".
+   Default value is "mysql://openser:openserrw@localhost/openser"
 
    Example 1.1. Set write_db_url parameter
 ...
-modparam("p_usrloc", "write_db_url", "mysql://openser:openserrw@localhost/opense
-r")
+modparam("p_usrloc", "write_db_url", "mysql://username:password@localhost/databa
+sename")
 ...
 
 3.2. read_db_url (string)
@@ -289,12 +289,11 @@ r")
    from. It is seperated from write access, so for better performance, a
    local replicate can be used for read access.
 
-   Default value is "mysql://openser:openserrw@localhost/openser".
+   Default value is mysql://openser:openserrw@localhost/openser .
 
    Example 1.2. Set read_db_url parameter
 ...
-modparam("p_usrloc", "read_db_url", "mysql://openser:openserrw@localhost/openser
-")
+modparam("p_usrloc", "read_db_url", "mysql://user:passwd@localhost/db")
 ...
 
 3.3. reg_db_table (string)
@@ -659,8 +658,8 @@ modparam("p_usrloc", "db_mode", 2)
 +----+----+------+--------+--------+---------------------+-------+----+
 ...
 
-   The urls are omitted for a better overview, but you can use standard
-   openser database URLs like mysql://openser:openserrw@localhost/openser.
+   The URLs are omitted for a better overview, but you can use standard
+   Kamailio database URLs like mysql://openser:openserrw@localhost/openser
    Databases don't need to be on different hosts, e.g. for testing
    purposes.
 
diff --git a/modules_k/p_usrloc/doc/p_usrloc_admin.xml b/modules_k/p_usrloc/doc/p_usrloc_admin.xml
index dbea4f7..55703c1 100644
--- a/modules_k/p_usrloc/doc/p_usrloc_admin.xml
+++ b/modules_k/p_usrloc/doc/p_usrloc_admin.xml
@@ -9,6 +9,7 @@
 ]>
 <!-- Module User's Guide -->
 
+
 <chapter>
     <chapterinfo>
     </chapterinfo>
@@ -111,15 +112,13 @@
 		The url to the master database where errors are written to.
 	    </para>
 	    <para>
-		<emphasis>
-		    Default value is <quote>mysql://openser:openserrw@localhost/openser</quote>.
-		</emphasis>
+		    Default value is <quote>&defaultdb;</quote>
 	    </para>
 	    <example>
 		<title>Set <varname>write_db_url</varname> parameter</title>
 		<programlisting format="linespecific">
 ...
-modparam("p_usrloc", "write_db_url", "mysql://openser:openserrw@localhost/openser")
+modparam("p_usrloc", "write_db_url", "mysql://username:password@localhost/databasename")
 ...
 </programlisting>
 	    </example>
@@ -132,15 +131,14 @@ modparam("p_usrloc", "write_db_url", "mysql://openser:openserrw@localhost/opense
 		performance, a local replicate can be used for read access.
 	    </para>
 	    <para>
-		<emphasis>
-		    Default value is <quote>mysql://openser:openserrw@localhost/openser</quote>.
+		<emphasis>Default value is &defaultdb; .
 		</emphasis>
 	    </para>
 	    <example>
 		<title>Set <varname>read_db_url</varname> parameter</title>
 		<programlisting format="linespecific">
 ...
-modparam("p_usrloc", "read_db_url", "mysql://openser:openserrw@localhost/openser")
+modparam("p_usrloc", "read_db_url", "mysql://user:passwd@localhost/db")
 ...
 </programlisting>
 	    </example>
@@ -682,10 +680,10 @@ modparam("p_usrloc", "db_mode", 2)
 +----+----+------+--------+--------+---------------------+-------+----+
 ...
 		</programlisting>
-		<para>The urls are omitted for a better overview, but you can use
-			standard openser database URLs like
-			mysql://openser:openserrw@localhost/openser. Databases don't
-			need to be on different hosts, e.g. for testing purposes.
+		<para>The URLs are omitted for a better overview, but you can use
+			standard &kamailio; database URLs like
+			&defaultdb; 
+			Databases don't need to be on different hosts, e.g. for testing purposes.
 		</para>
 	</example>
 		<para>




More information about the sr-dev mailing list