From 8e52d6a0014e1987611b5a1f9fb911b79ddf7f9d Mon Sep 17 00:00:00 2001
From: yann degat <yann.degat@corp.ovh.com>
Date: Mon, 16 Mar 2020 15:02:28 +0000
Subject: [PATCH] fix auto provisionning

---
 .gitignore   |  3 ++-
 main.tf      |  2 +-
 provision.sh | 37 ++++++++++++++++++++++++++-----------
 variables.tf |  5 +++++
 4 files changed, 34 insertions(+), 13 deletions(-)

diff --git a/.gitignore b/.gitignore
index 7d5de99..2e4edf4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
+live/*
 clouds.yaml
 .terraform
 terraform.tfstate
-.terragrunt-cache
\ No newline at end of file
+.terragrunt-cache
diff --git a/main.tf b/main.tf
index b1e9d52..aef526a 100644
--- a/main.tf
+++ b/main.tf
@@ -86,7 +86,7 @@ locals {
   ][0]
 
   ip_parts = split(".", local.jitsi)
-  fqdn     = format("ip%s.ip-%s-%s-%s.eu", local.ip_parts[3], local.ip_parts[0], local.ip_parts[1], local.ip_parts[2])
+  fqdn     = var.fqdn != "" ? var.fqdn : format("ip%s.ip-%s-%s-%s.eu", local.ip_parts[3], local.ip_parts[0], local.ip_parts[1], local.ip_parts[2])
 
   user_data = {
     hostname = local.fqdn
diff --git a/provision.sh b/provision.sh
index 42f5892..1deb2af 100644
--- a/provision.sh
+++ b/provision.sh
@@ -14,18 +14,33 @@ sudo apt-get -y update
 
 #first install with a self signed cert. then restart with letsencrypt
 cat > /tmp/jitsi.seeds <<EOF
-jitsi-meet-web-config   jitsi-meet/cert-choice  select  Generate a new self-signed certificate (You will later get a chance to obtain a Let's encrypt certificate)
-jitsi-meet-prosody      jitsi-meet-prosody/jvb-hostname string  $(hostname)
-jitsi-meet-web-config   jitsi-meet/jvb-serve    boolean true
-jitsi-meet-prosody      jicofo/jicofo-authuser  string  focus
-jitsi-meet-web-config   jitsi-meet/cert-path-key        string
-jicofo  jitsi-videobridge/jvb-hostname  string  $(hostname)
-jitsi-meet-prosody      jitsi-videobridge/jvb-hostname  string  $(hostname)
-jitsi-meet-web-config   jitsi-videobridge/jvb-hostname  string  $(hostname)
-jitsi-videobridge       jitsi-videobridge/jvb-hostname  string  $(hostname)
-jitsi-meet-web-config   jitsi-meet/cert-path-crt        string
-jitsi-meet-web-config   jitsi-meet/jvb-hostname string  $(hostname)
+jitsi-meet-web-config	jitsi-meet/cert-choice	select	Generate a new self-signed certificate (You will later get a chance to obtain a Let's encrypt certificate)
+jitsi-meet-web-config	jitsi-meet/jvb-hostname	string	$(hostname)
+jitsi-meet-web-config	jitsi-videobridge/jvb-hostname	string	$(hostname)
+jitsi-videobridge	jitsi-videobridge/jvb-hostname	string	$(hostname)
 EOF
+
+sudo mkdir -p /etc/jitsi/videobridge/
+sudo tee /etc/jitsi/videobridge/sip-communicator.properties <<EOF
+org.jitsi.videobridge.rest.jetty.host=::
+org.jitsi.videobridge.rest.jetty.port=443
+org.jitsi.videobridge.rest.jetty.ProxyServlet.hostHeader=$(hostname)
+org.jitsi.videobridge.rest.jetty.ProxyServlet.pathSpec=/http-bind
+org.jitsi.videobridge.rest.jetty.ProxyServlet.proxyTo=http://localhost:5280/http-bind
+org.jitsi.videobridge.rest.jetty.ResourceHandler.resourceBase=/usr/share/jitsi-meet
+org.jitsi.videobridge.rest.jetty.ResourceHandler.alias./config.js=/etc/jitsi/meet/$(hostname)-config.js
+org.jitsi.videobridge.rest.jetty.ResourceHandler.alias./interface_config.js=/usr/share/jitsi-meet/interface_config.js
+org.jitsi.videobridge.rest.jetty.ResourceHandler.alias./logging_config.js=/usr/share/jitsi-meet/logging_config.js
+org.jitsi.videobridge.rest.jetty.ResourceHandler.alias./external_api.js=/usr/share/jitsi-meet/libs/external_api.min.js
+org.jitsi.videobridge.rest.jetty.RewriteHandler.regex=^/([a-zA-Z0-9]+)$
+org.jitsi.videobridge.rest.jetty.RewriteHandler.replacement=/
+org.jitsi.videobridge.rest.jetty.SSIResourceHandler.paths=/
+org.jitsi.videobridge.rest.jetty.tls.port=443
+org.jitsi.videobridge.TCP_HARVESTER_PORT=443
+org.jitsi.videobridge.rest.jetty.sslContextFactory.keyStorePath=/etc/jitsi/videobridge/$(hostname).jks
+org.jitsi.videobridge.rest.jetty.sslContextFactory.keyStorePassword=changeit
+EOF
+
 sudo debconf-set-selections /tmp/jitsi.seeds
 sudo apt-get install -y jitsi-meet
 
diff --git a/variables.tf b/variables.tf
index 7d46ac6..2f03e31 100644
--- a/variables.tf
+++ b/variables.tf
@@ -48,3 +48,8 @@ variable ssh_user {
   description = "Name of the user used in image_name"
   default     = "ubuntu"
 }
+
+variable fqdn {
+  description = "Fully qualified domain name of the server. By default, will use the reverse name of the public ip"
+  default     = ""
+}