summaryrefslogtreecommitdiff
path: root/configs
diff options
context:
space:
mode:
authorzuul <zuul@gerrit.asterisk.org>2016-08-16 10:03:18 -0500
committerGerrit Code Review <gerrit2@gerrit.digium.api>2016-08-16 10:03:18 -0500
commit72b102bab8570ff4d655fd13046f447807e9cbf7 (patch)
tree5cca062faa94c46b4944fa05a15a22066d0e63b3 /configs
parent1ae4b3c289e1cebaf94ed3b3979269c4a540d751 (diff)
parent811e7d778851a844cc99987b818d14b68825ab8c (diff)
Merge "core: Entity ID is not set or invalid" into 14
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 818f5c2fb..6d6d2f0bb 100644
--- a/configs/samples/asterisk.conf.sample
+++ b/configs/samples/asterisk.conf.sample
@@ -89,6 +89,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]