@drumee/setup-infra 1.0.7 → 1.0.9

package/bin/install

@@ -4,7 +4,6 @@ set -e
 echo "Configuring Drumee Infrastructure"
 script_dir=$(dirname $(readlink -f $0))
 
-clean_vendor_files
 
 export base=$(dirname $script_dir)
 $base/bin/init-mail $DRUMEE_DOMAIN_NAME
@@ -20,6 +19,8 @@ fi
 source $base/bin/env
 source $base/bin/prosody
 
+clean_vendor_files
+
 protect_dir $DRUMEE_RUNTIME_DIR "no" "mkdir"
 protect_dir $DRUMEE_DATA_DIR "yes" "mkdir"
 cd $DRUMEE_DATA_DIR

package/bin/set-jitsi-conf

@@ -1,8 +1,9 @@
-#!/bin/bash
+#!/bin/sh
 if [ -e /etc/drumee/drumee.sh ]; then
   if [ -e /etc/prosody/defaults/credentials.sh ]; then
-    source /etc/drumee/drumee.sh
-    source /etc/prosody/defaults/credentials.sh
+    . /etc/drumee/drumee.sh
+    . /etc/prosody/defaults/credentials.sh
+    . /usr/share/debconf/confmodule
     turn_secret=$(grep static-auth-secret /etc/turnserver.conf | sed -E "s/^.+=//")
     db_set jitsi-videobridge/jvb-hostname $JITSI_DOMAIN
     db_set jitsi-videobridge/jvbsecret $JVB_PASSWORD

package/index.js

@@ -227,9 +227,14 @@ function makeData(opt) {
       if (/.+\+$/.test(value)) {
         value = value.replace(/\+$/, data[key]);
       }
-      data[key] = value || fallback;
+      data[key] = value.trim() || fallback;
     }
   }
+
+  if(data.public_ip4){
+    data.reverse_ip4 = data.public_ip4.split('.').reverse().join('.');
+  }
+
   return data;
 }
 /**
@@ -401,6 +406,12 @@ function writeInfraConf(data) {
     `${mariadb}/50-server.cnf`,
   ];
 
+  if(data.reverse_ip4){
+    targets.push({
+      tpl: `var/lib/bind/reverse.tpl`,
+      out: `var/lib/bind/${data.public_ip4}`
+    })
+  }
   data.dkim_key = getDkim(dkim);
   data.mail_user = MAIL_USER || 'postfix';
   data.mail_password = uniqueId();
@@ -534,7 +545,6 @@ function configure() {
     const isPrivate = await privateIp();
     let os = require("os");
     let interfaces = os.networkInterfaces();
-    let public_address;
     for (let name in interfaces) {
       for (let dev of interfaces[name]) {
         if (dev.family == 'IPv4') {

package/package.json

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

package/templates/etc/bind/named.conf.local

@@ -11,3 +11,11 @@ zone "<%= domain %>" {
     allow-update { key "update"; };
     allow-transfer { <%= public_ip4 %>; };
 };
+
+<% if (typeof(reverse_ip4) !== "undefined" && reverse_ip4 != "" ) { %>
+zone "<%= reverse_ip4 %>" {
+    type master;
+    file "/var/lib/bind/<%= public_ip4 %>";
+    allow-query { any; };
+};
+<% } %>

package/templates/etc/drumee/drumee.sh.tpl

@@ -30,7 +30,7 @@ export DRUMEE_SERVER_NODE=<%= runtime_dir %>/dist/main/node_modules
 export DRUMEE_STATIC_DIR=<%= static_dir %>
 export DRUMEE_SYSTEM_GROUP=<%= system_group %>
 export DRUMEE_SYSTEM_USER=<%= system_user %>
-export DRUMEE_TMP_DIR=<%= runtime_dir %>/tmp
+export DRUMEE_TMP_DIR=<%= data_dir %>/tmp
 export DRUMEE_UI_HOME=<%= runtime_dir %>/ui
 export DRUMEE_STORAGE_BACKUP=<%= storage_backup %>
 export DRUMEE_DB_BACKUP=<%= db_backup %>

package/templates/etc/drumee/infrastructure/mfs.conf.tpl

@@ -7,10 +7,10 @@
 location / {
   index /-/;
 
-  location ~ (.+)\.(.+)$ {
+  location ~ (.+)$ {
     add_header Cache-Control max-age=31536000;
     fastcgi_hide_header Set-Cookie;
     add_header Access-Control-Allow-Origin <%= domain %>;
-    rewrite /(.+)$ <%= public_ui_root %>/svc/media.raw?p=$1&d=inline;
+    rewrite /(.+)$ <%= public_ui_root %>/svc/media.raw?p=/$1&d=inline;
   }
 }

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

@@ -4,7 +4,9 @@ charset utf8;
 
 client_max_body_size 0;
 
-root /usr/share/jitsi-meet;
+# Disable direct access to jitsi UI
+# root /usr/share/jitsi-meet;
+root <%= static_dir %>;
 
 # ssi on with javascript for multidomain variables in config.js
 ssi on;

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

@@ -24,6 +24,13 @@ server {
 	root <%= server_dir %>;
 	server_name <%= domain %>; 
 	client_max_body_size <%= max_body_size %>;
+
+	# Security headers
+	add_header X-Content-Type-Options nosniff;
+	add_header X-XSS-Protection "1; mode=block";
+
+	set $prefix "";
+
 	include /etc/drumee/ssl/main.conf;
 	include /etc/drumee/infrastructure/routes/*.conf;
 	include /etc/drumee/infrastructure/internals/*.conf;

package/templates/etc/nginx/sites-enabled/loopback.tpl

@@ -0,0 +1,32 @@
+
+# -------------------------------------------------------------
+# !!!!!!! DO NOT EDIT !!!!!!!!
+# Config file automatically generated by <setup-infra>
+# Purpose     : Provide Nginx config to a specific server
+# Server name : loopback
+# Date        : <%= date %>
+# -------------------------------------------------------------
+
+
+proxy_cache_path <%= cache_dir %>/loopback levels=1:2 keys_zone=loopback_keys_zone:10m max_size=10g inactive=60m;
+server {
+	listen 127.0.0.1:80;
+	server_name _; 
+	#
+	root <%= server_dir %>;
+	server_name _; 
+	client_max_body_size <%= max_body_size %>;
+
+	# Security headers
+	add_header X-Content-Type-Options nosniff;
+	add_header X-XSS-Protection "1; mode=block";
+
+	set $prefix "";
+
+	include /etc/drumee/ssl/main.conf;
+	include /etc/drumee/infrastructure/routes/*.conf;
+	include /etc/drumee/infrastructure/internals/*.conf;
+	include /etc/drumee/infrastructure/mfs.conf;
+}
+
+

package/templates/var/lib/bind/revserse.tpl

@@ -0,0 +1,17 @@
+$TTL 3D
+$ORIGIN <%= reverse_ip4 %>.
+;
+@       IN      SOA     ns1.<%= domain %>. master.<%= domain %>. (
+                        <%= serial %>   ; serial, today date + today serial
+                        1H              ; refresh, seconds
+                        2H              ; retry, seconds
+                        4W              ; expire, seconds
+                        1D )            ; minimum, seconds
+;
+;
+@			IN  NS      ns1.<%= domain %>.
+@			IN  NS      ns2.<%= domain %>.
+
+2           IN  PTR     ns1.<%= domain %>.
+3           IN  PTR     ns2.<%= domain %>.
+3           IN  PTR     smtp.<%= domain %>.

package/custom.sh

@@ -1,21 +0,0 @@
-apt install -y git
-mkdir /root/reinstall
-cd /root/reinstall
-curl -O https://download.jitsi.org/stable/jitsi-videobridge2_2.3-92-g64f9f34f-1_all.deb
-curl -O https://download.jitsi.org/stable/jicofo_1.0-1075-1_all.deb
-curl -O https://download.jitsi.org/stable/jitsi-meet-prosody_1.0.7874-1_all.deb
-curl -O https://download.jitsi.org/stable/jitsi-meet-turnserver_1.0.7874-1_all.deb
-curl -O https://download.jitsi.org/stable/jitsi-meet-web-config_1.0.7874-1_all.deb
-curl -O https://download.jitsi.org/stable/jitsi-meet-web_1.0.7874-1_all.deb
-curl -O https://download.jitsi.org/stable/jitsi-meet_2.0.9364-1_all.deb
-
-
-apt install /root/reinstall/jicofo_1.0-1075-1_all.deb -y
-apt install /root/reinstall/jitsi-videobridge2_2.3-92-g64f9f34f-1_all.deb -y
-apt install /root/reinstall/jitsi-meet-web-config_1.0.7874-1_all.deb -y
-apt install /root/reinstall/jitsi-meet-web_1.0.7874-1_all.deb -y
-apt install /root/reinstall/jitsi-meet-prosody_1.0.7874-1_all.deb -y
-apt install /root/reinstall/jitsi-meet-turnserver_1.0.7874-1_all.deb -y
-apt install /root/reinstall/jitsi-meet_2.0.9364-1_all.deb -y
-
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDjPCTSuU0ThzsJ3Tp6qP2jQQz2QtV5j4+U3tPgSleqgy3Dkb99jeWcZfknmcNibpxjynw8QrT/tQ+WxUOB0xh/nC0YvWQnPE7rguBQ9gjvOVaTYaVcMSzv+fSckGPDI5KuPpmodmtuvNKw5R8lFlK+2TkOHzZ4WU9xFwZwvgVCuZJbhBOPJWOCW3abqhAZXRYwAvC07wEtivKJ5zeFEPFhDea/wjHxWX0iXTc6utpCxwoydbfDc19cCIqOUHcimbAuoa8aDtc2qt0N2zB/Q2yko3p8+00RouZ41xYXe++JGNbwsvTpogm46H5hj/TuunrLnLApHGWBkw59T6HMGPtp somanos@chrouk.local