@drumee/setup-infra 1.0.15 → 1.0.19

package/templates/utils.js

@@ -1,41 +1,12 @@
 const argparse = require("argparse");
 const { existsSync } = require("fs");
 const { readFileSync } = require(`jsonfile`);
-const {
-  BACKUP_STORAGE,
-  DRUMEE_DATA_DIR,
-  DRUMEE_DB_DIR,
-  MAX_BODY_SIZE,
-  PRIVATE_DOMAIN,
-  PRIVATE_IP4,
-  PUBLIC_DOMAIN,
-  PUBLIC_IP4,
-  PUBLIC_IP6,
-  DRUMEE_ROOT,
-  HTTP_PORT,
-  HTTPS_PORT,
-  FORCE_INSTALL,
-  ADMIN_EMAIL,
-  DRUMEE_DESCRIPTION
-} = process.env;
 
 const parser = new argparse.ArgumentParser({
   description: "Drumee Infrastructure Helper",
   add_help: true,
 });
 
-parser.add_argument("--admin_email", {
-  type: String,
-  default: ADMIN_EMAIL || "admin@localhost",
-  help: "Drumee Instance Admin User Email",
-});
-
-parser.add_argument("--description", {
-  type: String,
-  default: DRUMEE_DESCRIPTION || "My Drumee Team Server",
-  help: "Drumee Instance Description",
-});
-
 parser.add_argument("--readonly", {
   type: "int",
   default: 0,
@@ -44,73 +15,61 @@ parser.add_argument("--readonly", {
 
 parser.add_argument("--chroot", {
   type: String,
-  default: '/',
+  default: null,
   help: "Output root. Defaulted to /",
 });
 
-parser.add_argument("--reconfigure", {
-  type: "int",
-  default: FORCE_INSTALL || 0,
+parser.add_argument("--force-install", {
+  type: String,
+  default: 0,
   help: "Override existing configs",
 });
 
 parser.add_argument("--outdir", {
   type: String,
-  default: '/',
+  default: null,
   help: "If set, takes precedent on chroot. Output root. Defaulted to /",
 });
 
-parser.add_argument("--log-dir", {
-  type: String,
-  default: '/var/log/drumee',
-  help: "Drumee server log location",
-});
-
-parser.add_argument("--verbosity", {
-  type: "int",
-  default: 2,
-  help: "Server log level",
-});
-
 parser.add_argument("--public-domain", {
   type: String,
-  default: PUBLIC_DOMAIN,
+  default: null,
   help: "Public domain name",
 });
 
 parser.add_argument("--private-domain", {
   type: String,
-  default: PRIVATE_DOMAIN,
+  default: null,
   help: "Private domain name",
 });
 
-parser.add_argument("--local-domain", {
-  type: String,
-  default: PRIVATE_DOMAIN,
-  help: "",
-});
-
 parser.add_argument("--public-ip4", {
   type: String,
-  default: PUBLIC_IP4,
+  default: null,
   help: "Public IPV4",
 });
 
 parser.add_argument("--public-ip6", {
   type: String,
-  default: PUBLIC_IP6,
+  default: null,
   help: "Public IPV6",
 });
 
 parser.add_argument("--private-ip4", {
   type: String,
-  default: PRIVATE_IP4,
+  default: null,
   help: "Private IPV4",
 });
 
+parser.add_argument("--private-ip6", {
+  type: String,
+  default: null,
+  help: "Private IPV6",
+});
+
 parser.add_argument("--envfile", {
   type: String,
-  help: "Dataset required to install Drumee",
+  help: "Data set required to install Drumee",
 });
 
 parser.add_argument("--only-infra", {
@@ -119,97 +78,12 @@ parser.add_argument("--only-infra", {
   help: "If set, write only configs related to infra. Same as no-jitsi",
 });
 
-parser.add_argument("--localhost", {
-  type: "int",
-  default: 0,
-  help: "If set, write minimal configs, no jitsi, no bind",
-});
-
-parser.add_argument("--http-port", {
-  type: "int",
-  default: HTTP_PORT || 80,
-  help: "If set, write minimal configs, no jitsi, no bind",
-});
-
-parser.add_argument("--https-port", {
-  type: "int",
-  default: HTTPS_PORT || 443,
-  help: "If set, write minimal configs, no jitsi, no bind",
-});
-
-parser.add_argument("--data-dir", {
-  type: String,
-  default: DRUMEE_DATA_DIR || "/var/lib/drumee/data",
-  help: "Partition or directory dedicated to store drumee data",
-});
-
-parser.add_argument("--db-dir", {
-  type: String,
-  default: DRUMEE_DB_DIR || "/var/lib/mysql",
-  help: "Partition or directory dedicated to store drumee database",
-});
-
-parser.add_argument("--system-user", {
-  type: String,
-  default: "www-data",
-  help: "System user used to run Drumee",
-});
-
-parser.add_argument("--system-group", {
-  type: String,
-  default: "www-data",
-  help: "System group used to run Drumee",
-});
-
-parser.add_argument("--watch-dirs", {
-  type: String,
-  default: null,
-  help: "pm2 watch directories",
-});
-
-parser.add_argument("--watch-delay", {
-  type: 'int',
-  default: 1000,
-  help: "pm2 watch delay",
-});
-
-parser.add_argument("--watch-symlinks", {
-  type: 'int',
-  default: 0,
-  help: "pm2 watch delay",
-});
-
-parser.add_argument("--watch-ignore", {
-  type: String,
-  default: null,
-  help: "pm2 ignore directories",
-});
-
-parser.add_argument("--drumee-root", {
-  type: String,
-  default: DRUMEE_ROOT || "/var/lib/drumee",
-  help: "Drumee main base",
-});
-
-
 parser.add_argument("--no-jitsi", {
   type: "int",
   default: 0,
   help: "If set, won't write configs related to jisit. Same as only-infra",
 });
 
-parser.add_argument("--max-body-size", {
-  type: String,
-  default: MAX_BODY_SIZE || '10G',
-  help: "If set, won't write configs related to jisit. Same as only-infra",
-});
-
-parser.add_argument("--backup-storage", {
-  type: String,
-  default: BACKUP_STORAGE || '10G',
-  help: "If set, the partition or directiry will used to backup Drumee data",
-});
-
 const args = parser.parse_args();
 
 /**
@@ -219,9 +93,10 @@ function hasExistingSettings(envfile = '/etc/drumee/drumee.json') {
   if (!existsSync(envfile)) return false;
   const { domain_name } = readFileSync(envfile);
   if (!domain_name) return false;
-  if (args.reconfigure == 1) {
+  const override = process.env.FORCE_INSTALL || args.force_install;
+  if (override) {
     console.log(
-      `There is already a Drumee instance installed on this server but you selected reconfigure\n`,
+      `There is already a Drumee instance installed on this server but you selected FORCE_INSTALL\n`,
       `ALL EXISTING DATA related to ${domain_name} WILL BE LOST\n`,
     );
     return false;
@@ -229,7 +104,7 @@ function hasExistingSettings(envfile = '/etc/drumee/drumee.json') {
   console.log(
     `There is already a Drumee instance installed on this server\n`,
     `domain name = ${domain_name}\n`,
-    `Use --reconfigure=1 \n`,
+    `Use --force-install or export FORCE_INSTALL=1\n`,
     `********************************************\n`,
     `* WARNING : ALL EXISTING DATA WILL BE LOST *\n`,
     `********************************************\n`,
@@ -237,4 +112,4 @@ function hasExistingSettings(envfile = '/etc/drumee/drumee.json') {
   return true;
 }
 
-module.exports = { args, parser, hasExistingSettings };
+module.exports = { args, hasExistingSettings };

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

@@ -0,0 +1,70 @@
+$TTL 3D
+$ORIGIN <%= domain %>.
+;
+@       IN      SOA     ns1.<%= domain %>. master.<%= domain %>. (
+                        <%= serial %>   ; serial, today date + today serial
+                        1H              ; refresh, seconds
+                        2H              ; retry, seconds
+                        4W              ; expire, seconds
+                        1D )            ; minimum, seconds
+;
+;
+@		60	IN  NS      ns1.<%= domain %>.
+@		60	IN  NS      ns2.<%= domain %>.
+;
+<% if (typeof(public_ip4) !== "undefined" && public_ip4 != "" ) { %>
+; A records
+@		60	IN	A	    <%= public_ip4 %>
+ns1		60	IN	A	    <%= public_ip4 %>
+ns2		60	IN	A	    <%= public_ip4 %>
+smtp	60	IN	A	    <%= public_ip4 %>
+jit		60	IN	A	    <%= public_ip4 %>
+*		60	IN	A	    <%= public_ip4 %>
+;
+<% } %>
+<% if (typeof(public_ip6) !== "undefined" && public_ip6 != "" ) { %>
+; AAAA records
+@		60	IN	AAAA	<%= public_ip6 %>
+ns1		60	IN	AAAA	<%= public_ip6 %>
+ns2		60	IN	AAAA	<%= public_ip6 %>
+smtp	60	IN	AAAA	<%= public_ip6 %>
+jit		60	IN	AAAA	<%= public_ip6 %>
+*		60	IN	AAAA	<%= public_ip6 %>
+<% } %>
+;
+; CNAME
+;
+www             IN   CNAME  <%= domain %>.
+;
+; MX records 
+;
+@               60  IN   MX 10  smtp.<%= domain %>.
+
+; TXT records 
+_acme-challenge 60	IN	TXT "acme-challenge"
+@               60	IN	TXT "v=spf1 a ~all"
+@               60	IN	TXT (<%= dkim_key %>)
+;
+;
+; DKIM 
+smtp._domainkey 60  IN  TXT (<%= dkim_key %>)
+dkim._domainkey 60  IN  TXT (<%= dkim_key %>)
+;
+;
+; DMARC 
+_dmarc          60  IN  TXT "v=DMARC1; p=quarantine;  sp=quarantine; aspf=s"
+;
+;
+; Jitsi subdomain
+$ORIGIN <%= jitsi_public_domain %>.
+;
+<% if (typeof(public_ip4) !== "undefined" && public_ip4 != "" ) { %>
+*		60	IN	A	    <%= public_ip4 %>
+<% } %>
+<% if (typeof(public_ip6) !== "undefined" && public_ip6 != "" ) { %>
+*		60	IN	AAAA	<%= public_ip6 %>
+<% } %>
+;
+; TXT records 
+_acme-challenge 60	IN	TXT	"jit-acme-challenge"
+

package/templates/var/lib/bind/private-reverse.tpl

@@ -1,5 +1,5 @@
 $TTL 3D
-$ORIGIN <%= private_reverse_ip4 %>.
+$ORIGIN <%= reverse_private_ip4 %>.
 ;
 @       IN      SOA     ns1.<%= private_domain %>. master.<%= private_domain %>. (
                         <%= serial %>   ; serial, today date + today serial

package/templates/var/lib/bind/{prvate.tpl → private.tpl}

@@ -40,15 +40,6 @@ www             IN   CNAME  <%= private_domain %>.
 ;
 @               60  IN   MX 10  smtp.<%= private_domain %>.
 
-; TXT records 
-_acme-challenge 60	IN	TXT "acme-challenge"
-@               60	IN	TXT "v=spf1 a ~all"
-@               60	IN	TXT (<%= dkim_key %>)
-;
-;
-; DKIM 
-smtp._domainkey 60  IN  TXT (<%= dkim_key %>)
-dkim._domainkey 60  IN  TXT (<%= dkim_key %>)
 ;
 ;
 ; DMARC 
@@ -56,7 +47,7 @@ _dmarc          60  IN  TXT "v=DMARC1; p=quarantine;  sp=quarantine; aspf=s"
 ;
 ;
 ; Jitsi subdomain
-$ORIGIN <%= jitsi_domain %>.
+$ORIGIN <%= jitsi_private_domain %>.
 ;
 <% if (typeof(private_ip4) !== "undefined" && private_ip4 != "" ) { %>
 *		60	IN	A	    <%= private_ip4 %>

package/templates/var/lib/bind/public-reverse.tpl

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

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

@@ -1,7 +1,7 @@
 $TTL 3D
-$ORIGIN <%= domain %>.
+$ORIGIN <%= public_domain %>.
 ;
-@       IN      SOA     ns1.<%= domain %>. master.<%= domain %>. (
+@       IN      SOA     ns1.<%= public_domain %>. master.<%= public_domain %>. (
                         <%= serial %>   ; serial, today date + today serial
                         1H              ; refresh, seconds
                         2H              ; retry, seconds
@@ -9,8 +9,8 @@ $ORIGIN <%= domain %>.
                         1D )            ; minimum, seconds
 ;
 ;
-@		60	IN  NS      ns1.<%= domain %>.
-@		60	IN  NS      ns2.<%= domain %>.
+@		60	IN  NS      ns1.<%= public_domain %>.
+@		60	IN  NS      ns2.<%= public_domain %>.
 ;
 <% if (typeof(public_ip4) !== "undefined" && public_ip4 != "" ) { %>
 ; A records
@@ -34,11 +34,11 @@ jit		60	IN	AAAA	<%= public_ip6 %>
 ;
 ; CNAME
 ;
-www             IN   CNAME  <%= domain %>.
+www             IN   CNAME  <%= public_domain %>.
 ;
 ; MX records 
 ;
-@               60  IN   MX 10  smtp.<%= domain %>.
+@               60  IN   MX 10  smtp.<%= public_domain %>.
 
 ; TXT records 
 _acme-challenge 60	IN	TXT "acme-challenge"
@@ -56,7 +56,7 @@ _dmarc          60  IN  TXT "v=DMARC1; p=quarantine;  sp=quarantine; aspf=s"
 ;
 ;
 ; Jitsi subdomain
-$ORIGIN <%= jitsi_domain %>.
+$ORIGIN <%= jitsi_public_domain %>.
 ;
 <% if (typeof(public_ip4) !== "undefined" && public_ip4 != "" ) { %>
 *		60	IN	A	    <%= public_ip4 %>

package/bin/init-private

@@ -1,40 +0,0 @@
-#!/bin/bash
-set -e
-source /etc/drumee/drumee.sh
-
-echo "Configuring private domain name..."
-
-if [ "$DRUMEE_PRIVATE_DOMAIN" = "" ]; then
-  if [ "$DRUMEE_DOMAIN_NAME" = "" ]; then
-    export DRUMEE_PRIVATE_DOMAIN=drumee.local
-  else
-    echo "Private domain name not found. Will run only on public mode."
-    exit 0
-  fi
-fi
-
-mydomain=$DRUMEE_PRIVATE_DOMAIN
-outdir=${CERTS_DIR}/${mydomain}_ecc
-
-key=${outdir}/${mydomain}.key
-csr=${outdir}/${mydomain}.csr
-cer=${outdir}/${mydomain}.cer
-
-mkir -p $outdir
-
-C=$(locale --all | grep utf8 | tail -1 | sed  -E "s/^(.+_)|(\..+)$//g")
-if [ "$C" = "" ]; then
-  C=XX
-fi
-
-openssl genpkey -algorithm RSA -out $key
-
-openssl req -new -key $key -out $csr -subj "/C=${C}/ST= /L=Local Domain /O=${DRUMEE_DESCRIPTION} /OU=${DRUMEE_DESCRIPTION} /CN=*.${mydomain} /emailAddress=${ADMIN_EMAIL}"
-
-openssl x509 -req -in $csr -signkey $key -out $cer
-
-openssl x509 -in $cer -noout -text
-
-cp $cer /etc/ssl/certs/
-
-exit 0

package/bin/set-jitsi-conf

@@ -1,14 +0,0 @@
-#!/bin/sh
-if [ -e /etc/drumee/drumee.sh ]; then
-  if [ -e /etc/prosody/defaults/credentials.sh ]; then
-    . /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
-    db_set jicofo/jicofo-authpassword $JICOFO_PASSWORD
-    db_set jitsi-meet-prosody/jvb-hostname $JITSI_DOMAIN
-    db_set jitsi-meet-prosody/turn-secret $turn_secret
-  fi
-fi