From 35a56aa221c6f2a9cbeba351124297cf76319fd5 Mon Sep 17 00:00:00 2001
From: Sebastian Kippe <sebastian@kip.pe>
Date: Fri, 1 May 2020 14:55:13 +0200
Subject: [PATCH 1/2] Update version to 20.04

---
 site-cookbooks/kosmos-ejabberd/attributes/default.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/site-cookbooks/kosmos-ejabberd/attributes/default.rb b/site-cookbooks/kosmos-ejabberd/attributes/default.rb
index 22d1e9d..f383af4 100644
--- a/site-cookbooks/kosmos-ejabberd/attributes/default.rb
+++ b/site-cookbooks/kosmos-ejabberd/attributes/default.rb
@@ -1,5 +1,5 @@
-node.default["kosmos-ejabberd"]["version"] = "20.03"
-node.default["kosmos-ejabberd"]["checksum"] = "f0ccf1c47c3a30303140f08c887998ee34e731f34ea240d56748a68aa2a2e303"
+node.default["kosmos-ejabberd"]["version"] = "20.04"
+node.default["kosmos-ejabberd"]["checksum"] = "5377ff18960a399e661fa23f4a1d9f57c78d4579ed108c52b8f68e7cd9268868"
 
 node.override["tor"]["HiddenServices"]["ejabberd"] = {
   "HiddenServicePorts" => [

From ef2fa2da722d93d57a9d69f87a67f8e63a8dea78 Mon Sep 17 00:00:00 2001
From: Sebastian Kippe <sebastian@kip.pe>
Date: Fri, 1 May 2020 16:25:38 +0200
Subject: [PATCH 2/2] Configure STUN/TURN

Configures built-in STUN/TURN support, and adds the new service discovery
module for it.
---
 site-cookbooks/kosmos-ejabberd/recipes/default.rb         | 6 ++++++
 site-cookbooks/kosmos-ejabberd/templates/ejabberd.yml.erb | 8 ++++++++
 2 files changed, 14 insertions(+)

diff --git a/site-cookbooks/kosmos-ejabberd/recipes/default.rb b/site-cookbooks/kosmos-ejabberd/recipes/default.rb
index 2de0b63..1899493 100644
--- a/site-cookbooks/kosmos-ejabberd/recipes/default.rb
+++ b/site-cookbooks/kosmos-ejabberd/recipes/default.rb
@@ -200,6 +200,12 @@ unless node.chef_environment == "development"
     protocol :tcp
     command  :allow
   end
+
+  firewall_rule 'ejabberd_stun_turn' do
+    port     3478
+    protocol :udp
+    command  :allow
+  end
 end
 
 #
diff --git a/site-cookbooks/kosmos-ejabberd/templates/ejabberd.yml.erb b/site-cookbooks/kosmos-ejabberd/templates/ejabberd.yml.erb
index d657aec..9e4c14e 100644
--- a/site-cookbooks/kosmos-ejabberd/templates/ejabberd.yml.erb
+++ b/site-cookbooks/kosmos-ejabberd/templates/ejabberd.yml.erb
@@ -74,6 +74,13 @@ listen:
     ##  "/pub/archive": mod_http_fileserver
     ## register: true
     captcha: false
+  -
+    port: 3478
+    transport: udp
+    module: ejabberd_stun
+    use_turn: true
+    ## The server's public IPv4 address:
+    # turn_ip: 203.0.113.3
 
 s2s_use_starttls: optional
 
@@ -214,6 +221,7 @@ modules:
     versioning: true
     store_current_id: true
   mod_shared_roster: {}
+  mod_stun_disco: {}
   mod_vcard:
     search: false
   mod_vcard_xupdate: {}