diff options
| author | Walter Doekes <walter+asterisk@wjd.nu> | 2011-11-01 19:53:26 +0000 |
|---|---|---|
| committer | Walter Doekes <walter+asterisk@wjd.nu> | 2011-11-01 19:53:26 +0000 |
| commit | 25ee5f83b5c9e77be328a92b430d911396f1ac29 (patch) | |
| tree | d3c2949ed347c59f61bc00c6df33a71f68332796 /configs | |
| parent | ed1e02a4d35a66697c8c73432c493b155d638c1b (diff) | |
Cleanup references to sipusers and sipfriends dynamic realtime families
Somewhere between 1.4 and 1.8 the sipusers family has become completely
unused. Before that, the sipfriends family had been obsoleted in favor
of separate sipusers and sippeers families. Apparently, they have been
merged back again into a single family which is now called "sippeers".
Reviewed by: irroot, oej, pabelanger
Review: https://reviewboard.asterisk.org/r/1523
........
Merged revisions 342869 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 342870 from http://svn.asterisk.org/svn/asterisk/branches/10
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@342871 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'configs')
| -rw-r--r-- | configs/dbsep.conf.sample | 3 | ||||
| -rw-r--r-- | configs/extconfig.conf.sample | 1 | ||||
| -rw-r--r-- | configs/res_config_mysql.conf.sample | 2 | ||||
| -rw-r--r-- | configs/res_ldap.conf.sample | 1 |
4 files changed, 2 insertions, 5 deletions
diff --git a/configs/dbsep.conf.sample b/configs/dbsep.conf.sample index 9e0dd04e0..9cfa23740 100644 --- a/configs/dbsep.conf.sample +++ b/configs/dbsep.conf.sample @@ -17,8 +17,7 @@ # and res_config_curl.so in modules.conf and configure extconfig.conf: # # voicemail => curl,http://server/path/to/dbsep.cgi/voicemail -# sippeers => curl,http://server/path/to/dbsep.cgi/sipfriends -# sipusers => curl,http://server/path/to/dbsep.cgi/sipfriends +# sippeers => curl,http://server/path/to/dbsep.cgi/sippeers # # The Data Source Name, as specified by the Perl DBI module. diff --git a/configs/extconfig.conf.sample b/configs/extconfig.conf.sample index cc3fa9c9f..e08674e9d 100644 --- a/configs/extconfig.conf.sample +++ b/configs/extconfig.conf.sample @@ -63,7 +63,6 @@ ; ;iaxusers => odbc,asterisk ;iaxpeers => odbc,asterisk -;sipusers => odbc,asterisk ;sippeers => odbc,asterisk ;sipregs => odbc,asterisk ;voicemail => odbc,asterisk diff --git a/configs/res_config_mysql.conf.sample b/configs/res_config_mysql.conf.sample index 79eaf97d2..ab8ebf095 100644 --- a/configs/res_config_mysql.conf.sample +++ b/configs/res_config_mysql.conf.sample @@ -17,7 +17,7 @@ ; and writes should be performed to the same database. ; ; For example, in extconfig.conf, you could specify a line like: -; sippeers => mysql,readhost.asterisk/writehost.asterisk,sipfriends +; sippeers => mysql,readhost.asterisk/writehost.asterisk,sippeers ; and then define the contexts [readhost.asterisk] and [writehost.asterisk] ; below. ; diff --git a/configs/res_ldap.conf.sample b/configs/res_ldap.conf.sample index c49fbf1c3..4655841ec 100644 --- a/configs/res_ldap.conf.sample +++ b/configs/res_ldap.conf.sample @@ -7,7 +7,6 @@ ; In order to use this module, you start ; in extconfig.conf with a configuration like this: ; -; sipusers = ldap,"dc=myDomain,dc=myDomainExt",sip ; sippeers = ldap,"dc=myDomain,dc=myDomainExt",sip ; extensions = ldap,"dc=myDomain,dc=myDomainExt",extensions ; sip.conf = ldap,"dc=myDomain,dc=myDomainExt",config |