summaryrefslogtreecommitdiff
path: root/configs
diff options
context:
space:
mode:
authorzuul <zuul@gerrit.asterisk.org>2016-08-16 06:43:54 -0500
committerGerrit Code Review <gerrit2@gerrit.digium.api>2016-08-16 06:43:54 -0500
commit050b90769a2a2d0293f7c31d1c53f6f4a73c448c (patch)
tree18a923f7f05ee5c44461696167d306b13c77da95 /configs
parent6c4c31456fde265f874bbe9dfe28d7c011065e93 (diff)
parent403c794684a5a8afce2b490e5a40214f792794d4 (diff)
Merge "core: Entity ID is not set or invalid" into 13
Diffstat (limited to 'configs')
-rw-r--r--configs/samples/asterisk.conf.sample8
1 files changed, 8 insertions, 0 deletions
diff --git a/configs/samples/asterisk.conf.sample b/configs/samples/asterisk.conf.sample
index e4883ec97..b0543d803 100644
--- a/configs/samples/asterisk.conf.sample
+++ b/configs/samples/asterisk.conf.sample
@@ -88,6 +88,14 @@ documentation_language = en_US ; Set the language you want documentation
; considered dangerous because they can allow
; privilege escalation.
; Default no
+;entityid=00:11:22:33:44:55 ; Entity ID.
+ ; This is in the form of a MAC address.
+ ; It should be universally unique.
+ ; It must be unique between servers communicating
+ ; with a protocol that uses this value.
+ ; This is currently is used by DUNDi and
+ ; Exchanging Device and Mailbox State
+ ; using protocols: XMPP, Corosync and PJSIP.
; Changing the following lines may compromise your security.
;[files]