@drumee/setup-infra 1.0.4 → 1.0.6

package/bin/init-acme

@@ -6,8 +6,10 @@ function make_certs(){
   sum=0
   dom=$1
   echo Generating "${dom}" cetificates...
+  ./acme.sh 
+  OPTIONS=--issue -d $dom -d "*.${dom}" --home $ACME_DIR --config-home $ACME_DIR/configs --cert-home $ACME_CERTS_DIR --dns dns_nsupdate
   while [ ! -f ${ACME_CERTS_DIR}/${dom}_ecc/fullchain.cer ]; do
-    ./acme.sh --issue -d $dom -d "*.${dom}" --home $ACME_DIR --config-home $ACME_DIR/configs --cert-home $ACME_CERTS_DIR --dns dns_nsupdate
+    ./acme.sh $OPTIONS
     if [ $? = "0" ]; then
       echo Certificate have been sucessfully created.
     else
@@ -16,7 +18,7 @@ function make_certs(){
     fi
     if [ "$sum" -gt "10" ]; then
       echo Failed to create certifiicates. Please run manually
-      echo $ACME_DIR/acme.sh --issue -d $dom -d "*.${dom}" --home $ACME_DIR --config-home $ACME_DIR/configs --cert-home $ACME_CERTS_DIR --dns dns_nsupdate
+      echo $ACME_DIR/acme.sh  $OPTIONS
     fi
     sum=$(expr 1 + $sum)
   done

package/bin/install

@@ -21,7 +21,10 @@ fi
 source $base/bin/env
 source $base/bin/jitsi
 
-install_jitsi
+debconf-set-selections $base/bin/preset-jitsi
+if [ "$SKIP_JITSI" = "" ];  then
+  install_jitsi
+fi
 
 protect_dir $DRUMEE_RUNTIME_DIR "no" "mkdir"
 protect_dir $DRUMEE_DATA_DIR "yes" "mkdir"

package/bin/jitsi

@@ -107,7 +107,7 @@ function install_jitsi() {
   # Jitsi package
   echo Checking jitsi-meet packages
   installed=$(dpkg -l | egrep "^ii +jitsi-meet ")
-  if [ "$installed" = "" ]; then
+  if [ "$installed" = "" -o "$FORCE_INSTALL" = "yes" ]; then
     key=/etc/apt/trusted.gpg.d/jitsi-key.gpg
     if [ ! -f $key ]; then
       curl -sS https://download.jitsi.org/jitsi-key.gpg.key | gpg --dearmor | tee j$key >/dev/null 2>&1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@drumee/setup-infra",
-  "version": "1.0.4",
+  "version": "1.0.6",
   "description": "Drumee Infrastructure Setup Utilities",
   "main": "index.js",
   "scripts": {

package/templates/etc/jitsi/jicofo/sip-cmmunicator.properties

@@ -0,0 +1,3 @@
+org.jitsi.jicofo.BRIDGE_MUC=JvbBrewery@internal.auth.<%= jitsi_domain %>
+org.jitsi.jicofo.auth.URL=XMPP:<%= jitsi_domain %>
+org.jitsi.jicofo.ALWAYS_TRUST_MODE_ENABLED=true

package/templates/etc/jitsi/meet.conf.tpl

@@ -10,7 +10,7 @@ root /usr/share/jitsi-meet;
 ssi on;
 ssi_types application/x-javascript application/javascript;
 
-# index index.html index.htm;
+index index.html index.htm;
 error_page 404 /static/404.html;
 
 # Security headers
@@ -37,7 +37,7 @@ location = /external_api.js {
 
 
 
-ensure all static content can always be found first
+# ensure all static content can always be found first
 location ~ ^/(libs|css|static|images|fonts|lang|sounds|connection_optimization|.well-known)/(.*)$ {
    add_header 'Access-Control-Allow-Origin' '*';
    alias /usr/share/jitsi-meet/$1/$2;

package/templates/etc/nginx/sites-enabled/drumee.conf.tpl

@@ -22,7 +22,7 @@ server {
 	listen [::]:443 ssl;	
 	#
 	root <%= server_dir %>;
-	server_name _; 
+	server_name <%= domain %>; 
 	client_max_body_size <%= max_body_size %>;
 	include /etc/drumee/ssl/main.conf;
 	include /etc/drumee/infrastructure/routes/*.conf;

package/templates/etc/nginx/sites-enabled/jitsi.conf.tpl

@@ -21,7 +21,7 @@ server {
 server {
 	listen 443 ssl http2;
 	listen [::]:443 ssl http2;
-	server_name *.<%= jitsi_domain %>; 
+	server_name <%= jitsi_domain %>; 
 	include /etc/jitsi/ssl.conf;
 	include /etc/jitsi/meet.conf;
 }

package/templates/etc/prosody/conf.d/vhost.cfg.lua.tpl

@@ -53,8 +53,8 @@ VirtualHost "<%= jitsi_domain %>"
 VirtualHost "guest.<%= jitsi_domain %>"
     authentication = "anonymous"
     ssl = {
-        key = "/usr/share/acme/certs/jit.drumee.io_ecc/jit.drumee.io.key";
-        certificate = "/usr/share/acme/certs/jit.drumee.io_ecc/jit.drumee.io.cer";
+        key = "/usr/share/acme/certs/<%= jitsi_domain %>_ecc/<%= jitsi_domain %>.key";
+        certificate = "/usr/share/acme/certs/<%= jitsi_domain %>_ecc/<%= jitsi_domain %>.cer";
     }
     modules_enabled = {
         "bosh";
@@ -71,13 +71,13 @@ VirtualHost "guest.<%= jitsi_domain %>"
         "av_moderation";
  	    "turncredentials";
     }
-    main_muc = "muc.jit.drumee.io"
-    lobby_muc = "lobby.jit.drumee.io"
-    breakout_rooms_muc = "breakout.jit.drumee.io"
-    speakerstats_component = "speakerstats.jit.drumee.io"
-    conference_duration_component = "conferenceduration.jit.drumee.io"
-    end_conference_component = "endconference.jit.drumee.io"
-    av_moderation_component = "avmoderation.jit.drumee.io"
+    main_muc = "muc.<%= jitsi_domain %>"
+    lobby_muc = "lobby.<%= jitsi_domain %>"
+    breakout_rooms_muc = "breakout.<%= jitsi_domain %>"
+    speakerstats_component = "speakerstats.<%= jitsi_domain %>"
+    conference_duration_component = "conferenceduration.<%= jitsi_domain %>"
+    end_conference_component = "endconference.<%= jitsi_domain %>"
+    av_moderation_component = "avmoderation.<%= jitsi_domain %>"
     turncredentials_secret = "<%= turn_sercret %>"
     c2s_require_encryption = false