Skip to content
This repository has been archived by the owner on Feb 27, 2020. It is now read-only.

Commit

Permalink
Merge pull request #119 from Metaswitch/latest_to_stable
Browse files Browse the repository at this point in the history
[No reviewer] Move to the stable branch
  • Loading branch information
eleanor-merry committed Oct 12, 2015
2 parents e5d7e55 + 354f4a2 commit 439c5ed
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions docs/Clearwater_Configuration_Options_Reference.md
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ This section describes optional configuration options, particularly for ensuring
* `max_session_expires` - determines the maximum Session-Expires/Min-SE value which Sprout will accept in requests.
* `enum_server` - a comma-separated list of DNS servers which can handle ENUM queries.
* `enum_suffix` - determines the DNS suffix used for ENUM requests (after the digits of the number). Defaults to "e164.arpa"
* `enum_file` - if set (to a file path), and if `enum_server` is not set, Sprout will use this local JSON file for ENUM lookups rather than a DNS server. An example file is at http://clearwater.readthedocs.org/en/latest/ENUM/index.html#deciding-on-enum-rules.
* `enum_file` - if set (to a file path), and if `enum_server` is not set, Sprout will use this local JSON file for ENUM lookups rather than a DNS server. An example file is at http://clearwater.readthedocs.org/en/stable/ENUM/index.html#deciding-on-enum-rules.
* `icscf_uri` - the SIP address of the external I-CSCF integrated with your Sprout node (if you have one).
* `scscf_uri` - the SIP address of the Sprout S-CSCF. This defaults to `sip:$sprout_hostname:$scscf;transport=TCP` - this includes a specific port, so if you need NAPTR/SRV resolution, it must be changed to not include the port.
* `additional_home_domains` - this option defines a set of home domains which Sprout and Bono will regard as locally hosted (i.e. allowing users to register, not routing calls via an external trunk). It is a comma-separated list.
Expand Down Expand Up @@ -110,7 +110,7 @@ This section describes optional configuration options, particularly for ensuring
* `sip_blacklist_duration` - the time in seconds for which SIP peers are blacklisted when they are unresponsive (defaults to 30 seconds).
* `http_blacklist_duration` - the time in seconds for which HTTP peers are blacklisted when they are unresponsive (defaults to 30 seconds).
* `diameter_blacklist_duration` - the time in seconds for which Diameter peers are blacklisted when they are unresponsive (defaults to 30 seconds).
* `snmp_ip` - the IP address to send alarms to (defaults to being unset). If this is set then Sprout, Ralf, Homestead and Chronos will send alarms - more details on the alarms are [here](http://clearwater.readthedocs.org/en/latest/SNMP_Alarms/index.html)
* `snmp_ip` - the IP address to send alarms to (defaults to being unset). If this is set then Sprout, Ralf, Homestead and Chronos will send alarms - more details on the alarms are [here](http://clearwater.readthedocs.org/en/stable/SNMP_Alarms/index.html)
* `impu_cache_ttl` - the number of seconds for which Homestead will cache the SIP Digest from a Multimedia-Auth-Request. Defaults to 0, as Sprout does enough caching to ensure that it can handle an authenticated REGISTER after a challenge, and subsequent challenges should be rare.
* `hss_reregistration_time` - determines how many seconds should pass before Homestead sends a Server-Assignment-Request with type RE_REGISTRATION to the HSS. (On first registration, it will always send a SAR with type REGISTRATION). This determines a minimum value - after this many seconds have passed, Homestead will send the Server-Assignment-Request when the next REGISTER is received. Note that Homestead invalidates its cache of the registration and iFCs after twice this many seconds have passed, so it is not safe to set this to less than half of `reg_max_expires`.
* `sip_tcp_connect_timeout` - the time in milliseconds to wait for a SIP TCP connection to be established (defaults to 2000 milliseconds).
Expand Down
2 changes: 1 addition & 1 deletion docs/Migrating_To_etcd.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Clearwater now supports an [automatic clustering and configuration sharing](Auto

## Upgrade the Deployment

[Upgrade](Upgrading_a_Clearwater_deployment) to the latest stable Clearwater release. You will also need to update your firewall settings to support the new clearwater management packages; open port 2380 and 4000 between every node (see [here](http://clearwater.readthedocs.org/en/latest/Clearwater_IP_Port_Usage/index.html) for the complete list).
[Upgrade](Upgrading_a_Clearwater_deployment) to the latest stable Clearwater release. You will also need to update your firewall settings to support the new clearwater management packages; open port 2380 and 4000 between every node (see [here](http://clearwater.readthedocs.org/en/stable/Clearwater_IP_Port_Usage/index.html) for the complete list).

## Verify Configuration Files

Expand Down
2 changes: 1 addition & 1 deletion docs/Multiple_Network_Support.md
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ If you've already installed the Project Clearwater services, run `sudo service c

## Diagnostic Changes

All the built-in Clearwater diagnostics will automatically take note of network namespaces, but if you are running diagnostics yourself (e.g. following instructions from the [troubleshooting page](http://clearwater.readthedocs.org/en/latest/Troubleshooting_and_Recovery)) you may need to prefix your commands with `ip netns exec <namespace>` to run them in the signaling namespace. The following tools will need this prefix:
All the built-in Clearwater diagnostics will automatically take note of network namespaces, but if you are running diagnostics yourself (e.g. following instructions from the [troubleshooting page](http://clearwater.readthedocs.org/en/stable/Troubleshooting_and_Recovery)) you may need to prefix your commands with `ip netns exec <namespace>` to run them in the signaling namespace. The following tools will need this prefix:

* `cqlsh` - For viewing Cassandra databases
* `nodetool` - For viewing Cassandra status
Expand Down

0 comments on commit 439c5ed

Please sign in to comment.