Simplify prosody too

6 files changed, 46 insertions, 16 deletions

diff --git a/app/jitsi/integration/README.md b/app/jitsi/integration/README.md
index 315b5de..e295745 100644
--- a/app/jitsi/integration/README.md
+++ b/app/jitsi/integration/README.md
@@ -38,6 +38,14 @@ We are particularly interested by: https://github.com/lightbend/config#standard-
 Using 'application.conf' with classpath does not seem to work.
 But, specifying the file path as `-Dconfig.file=/etc/jitsi/jicofo.conf` works!
 
+Some parameters are also set independently of lightbend hocon config.
+They are seen in jicofo entrypoint:
+https://github.com/jitsi/jicofo/blob/master/src/main/java/org/jitsi/jicofo/Main.java
+Many of these parameters can be in fact read from the HOCON file except one: the `--secret` parameter or the `JICOFO_SECRET` env variable.
+But we can see this is a deprecated thing, it has been already removed from master: https://github.com/jitsi/jicofo/commit/c9e5b50a8b4e77f8b8cb8831a4a044a53edfcf48
+For now (as per v5390) we will keep `JICOFO_SECRET` environment variable but will assume no other environment variable is set
+But maybe this value is deprecated: the check is still here but it is not used anymore?!
+
 ## Resources to understand jitsi
 
   - [jicofo/debian/postinst](https://github.com/jitsi/jicofo/blob/master/debian/postinst)
diff --git a/app/jitsi/integration/dev.env b/app/jitsi/integration/dev.env
deleted file mode 100644
index 1dd2122..0000000
--- a/app/jitsi/integration/dev.env
+++ /dev/null
@@ -1,10 +0,0 @@
-JITSI_SECRET_VIDEOBRIDGE=S3CR3T01
-JITSI_SECRET_JICOFO_COMPONENT=S3CR3T02
-JITSI_SECRET_JICOFO_USER=S3CR3T03
-JITSI_PROSODY_BOSH_PORT=5280
-JITSI_PROSODY_BOSH_HOST=172.17.0.1
-JITSI_PROSODY_HOST=172.17.0.1
-JITSI_CERTS_FOLDER=/certs/
-JITSI_NAT_PUBLIC_IP=37.164.35.154
-JITSI_NAT_LOCAL_IP=192.168.0.231
-JITSI_VIDEO_TCP=8080
diff --git a/app/jitsi/integration/jicofo.conf b/app/jitsi/integration/jicofo/jicofo.conf
index 2351cde..edb87c5 100644
--- a/app/jitsi/integration/jicofo.conf
+++ b/app/jitsi/integration/jicofo/jicofo.conf
@@ -213,11 +213,11 @@ jicofo {
   octo {
     // Whether or not to use Octo. Note that when enabled, its use will be determined by
     // $jicofo.bridge.selection-strategy.
-    enabled = true
+    enabled = false
 
     // An identifier of the Jicofo instance, used for the purpose of generating conference IDs unique across a set of
     // Jicofo instances. Valid values are [1, 65535]. The value 0 is used when none is explicitly configured.
-    #id = 1234
+    id = 1
   }
 
   rest {
@@ -239,11 +239,11 @@ jicofo {
     // The separate XMPP connection used for communication with clients (endpoints).
     client {
       enabled = true
-      hostname = "localhost"
+      hostname = "jitsi-xmpp"
       port = 5222
       #domain =
       username = "focus"
-      #password =
+      password = "3x@mple01"
 
       // How long to wait for a response to a stanza before giving up.
       reply-timeout = 15 seconds
diff --git a/app/jitsi/integration/jitsi-certs/.gitignore b/app/jitsi/integration/jitsi-certs/.gitignore
deleted file mode 100644
index d6b7ef3..0000000
--- a/app/jitsi/integration/jitsi-certs/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*
-!.gitignore
diff --git a/app/jitsi/integration/videobridge.conf b/app/jitsi/integration/jvb/videobridge.conf
index e9bded0..e9bded0 100644
--- a/app/jitsi/integration/videobridge.conf
+++ b/app/jitsi/integration/jvb/videobridge.conf
diff --git a/app/jitsi/integration/prosody/prosody.cfg.lua b/app/jitsi/integration/prosody/prosody.cfg.lua
new file mode 100644
index 0000000..edfd820
--- /dev/null
+++ b/app/jitsi/integration/prosody/prosody.cfg.lua
@@ -0,0 +1,34 @@
+component_ports = { 5347 }
+component_interface = "0.0.0.0"
+http_ports = { ${JITSI_PROSODY_BOSH_PORT} }
+log = {
+  error="/dev/stderr"
+  info="/dev/stdout"
+}
+
+VirtualHost "jitsi.deuxfleurs.fr"
+  authentication = "anonymous"
+  ssl = {
+    key = "/var/lib/prosody/jitsi.key";
+    certificate = "/var/lib/prosody/jitsi.crt";
+  }
+  modules_enabled = {
+    "bosh";
+    "pubsub";
+  }
+  c2s_require_encryption = false
+
+VirtualHost "auth.jitsi.deuxfleurs.fr"
+  ssl = {
+    key = "/var/lib/prosody/auth.jitsi.key";
+    certificate = "/var/lib/prosody/auth.jitsi.crt";
+  }
+  authentication = "internal_plain"
+  admins = { "focus@auth.jitsi.deuxfleurs.fr"}
+
+Component "conference.jitsi.deuxfleurs.fr" "muc"
+Component "internal.auth.jitsi.deuxfleurs.fr" "muc"
+  storage = "memory"
+  modules_enabled = { "ping"; }
+  admins = { "focus@auth.jitsi.deuxfleurs.fr", "jvb@auth.jitsi.deuxfleurs.fr" }
+