@drumee/setup-infra 1.0.14 → 1.0.16

package/index.js

@@ -6,22 +6,51 @@ const { join, dirname } = require("path");
 const { isString } = require("lodash");
 const { exit } = process;
 const { loadSysEnv, sysEnv, uniqueId } = require("@drumee/server-essentials");
-const { totalmem, userInfo } = require('os');
+const { totalmem } = require('os');
 const {
-  existsSync, close, writeSync, openSync, readFileSync, mkdirSync
+  existsSync, close, writeSync, openSync, readFileSync
 } = require("fs");
 const { args, hasExistingSettings } = require('./templates/utils')
 
 const JSON_OPT = { spaces: 2, EOL: "\r\n" };
 
-const {
+let {
   ACME_DIR,
   ACME_EMAIL_ACCOUNT,
+  ADMIN_EMAIL,
+  BACKUP_STORAGE,
   CERTS_DIR,
+  DRUMEE_DATA_DIR,
+  DRUMEE_DB_DIR,
+  DRUMEE_DESCRIPTION,
+  DRUMEE_DOMAIN_NAME,
+  DRUMEE_HTTP_PORT,
+  DRUMEE_LOCAL_PORT,
+  DRUMEE_HTTPS_PORT,
   MAIL_USER,
+  MAX_BODY_SIZE,
   NSUPDATE_KEY,
+  PRIVATE_DOMAIN,
+  PRIVATE_IP4,
+  PRIVATE_IP6,
+  PUBLIC_IP4,
+  PRIVATE_IF4,
+  PUBLIC_IP6,
+  STORAGE_BACKUP,
+  INSTANCE_TYPE
 } = process.env;
 
+let PUBLIC_DOMAIN = DRUMEE_DOMAIN_NAME;
+
+if (PUBLIC_DOMAIN) {
+  if (!PRIVATE_DOMAIN) PRIVATE_DOMAIN = PUBLIC_DOMAIN.replace(/\.([a-z_\-0-9]{2,})$/, '.local');
+}
+
+PRIVATE_DOMAIN = PRIVATE_DOMAIN || 'local.drumee';
+DRUMEE_HTTPS_PORT = DRUMEE_HTTPS_PORT || 443;
+DRUMEE_LOCAL_PORT = DRUMEE_LOCAL_PORT || 8443;
+DRUMEE_HTTP_PORT = DRUMEE_HTTP_PORT || 80;
+
 /**
  *
  * @param {*} l
@@ -134,12 +163,19 @@ function writeTemplates(data, targets) {
         Template.write(data, out, tpl);
       }
     } catch (e) {
-      console.error(e)
-      console.error("Failed to write configs for", target)
+      console.error("Failed to write configs for", target, e)
     }
   }
 }
 
+/**
+ * 
+ * @returns 
+ */
+function isDevInstance() {
+  return /^dev/.test(INSTANCE_TYPE)
+}
+
 /**
  *
  */
@@ -170,9 +206,10 @@ function writeEcoSystem(data) {
     script: "./service.js"
   }, instances, 'cluster_mode');
 
+
   let f = factory(data);
   let routes = [main, main_service, f];
-  //let ecosystem = "etc/drumee/infrastructure/ecosystem.json";
+
   let ecosystem = Template.chroot("etc/drumee/infrastructure/ecosystem.json");
   if (args.readonly) {
     console.log("Readonly", ecosystem, routes);
@@ -217,7 +254,6 @@ function makeData(opt) {
     loadEnvFile(args.env_file, opt)
   }
   data.chroot = Template.chroot();
-  data.acme_store = join(data.certs_dir, `${data.domain_name}_ecc`);
   data.ca_server = data.ca_server || data.acme_ssl;
   if (data.own_ssl && data.certs_dir) {
     data.own_certs_dir = data.certs_dir;
@@ -226,30 +262,43 @@ function makeData(opt) {
     let [key, value, fallback] = row;
     if (!value) value = data[key] || fallback;
     if (value == null) continue;
-    if (isString(value)) {
+    if (!data[key]) {
       if (/.+\+$/.test(value)) {
         value = value.replace(/\+$/, data[key]);
       }
-      data[key] = value.trim() || fallback;
-    } else {
-      data[key] = value
+      if (isString(value)) {
+        data[key] = value.trim() || fallback;
+      } else {
+        data[key] = value;
+      }
     }
   }
 
-  /** Named extra settings */
-  data.allow_recursion = 'localhost;';
-  if (data.public_ip4) {
-    data.reverse_ip4 = data.public_ip4.split('.').reverse().join('.');
+
+  if (!data.storage_backup) {
+    data.storage_backup = ""
+  }
+
+  if (data.private_domain) {
+    data.jitsi_private_domain = `jit.${data.private_domain}`;
   } else {
-    data.reverse_ip4 = ""
+    data.jitsi_private_domain = "";
   }
 
-  if (!data.public_ip6) {
-    data.public_ip6 = "";
+  if (data.public_domain) {
+    data.use_email = 1;
+    data.jitsi_public_domain = `jit.${data.public_domain}`;
+  } else {
+    data.use_email = 0;
+    data.jitsi_public_domain = "";
   }
 
-  if (!data.storage_backup) {
-    data.storage_backup = ""
+  if (isDevInstance()) {
+    data.disable_symlinks = 'off';
+    data.logLevel = 3;
+  } else {
+    data.disable_symlinks = 'on';
+    data.logLevel = 2;
   }
   return data;
 }
@@ -260,6 +309,7 @@ function makeData(opt) {
  * @param {*} opt 
  */
 function loadEnvFile(file, opt) {
+  console.log({ file })
   let src = readJson(file);
   opt.map((r) => {
     let [key] = r;
@@ -272,53 +322,46 @@ function loadEnvFile(file, opt) {
  *
  */
 function getSysConfigs() {
+  let {
+    public_domain, private_domain, private_ip4, public_ip4, public_ip6, backup_storage
+  } = sysEnv();
   if (hasExistingSettings(Template.chroot('etc/drumee/drumee.json'))) {
     exit(0)
   }
 
-  let use_email = 0;
-  if (args.public_domain) use_email = 1;
-  let domain_name = args.public_domain || args.private_domain;
-  if (!domain_name) {
-    if (!args.localhost) {
-      console.log("There is no domain name defined for the installation", args);
-      exit(0)
-    }
-  }
+  public_domain = args.public_domain || PUBLIC_DOMAIN || public_domain;
+  private_domain = args.private_domain || PRIVATE_DOMAIN || private_domain;
 
+  backup_storage = args.backup_storage || BACKUP_STORAGE || STORAGE_BACKUP || backup_storage;
+
+  if (!public_domain && !private_domain) {
+    console.log("There is no domain name defined for the installation", args);
+    exit(0)
+  }
   const nsupdate_key = Template.chroot('etc/bind/keys/update.key')
   const opt = [
+    ["acme_dir", ACME_DIR],
+    ["acme_email_account", ACME_EMAIL_ACCOUNT, ADMIN_EMAIL],
+    ["admin_email", ADMIN_EMAIL],
+    ["backup_storage", backup_storage, ""],
+    ["certs_dir", CERTS_DIR],
+    ["data_dir", DRUMEE_DATA_DIR, '/data'],
+    ["db_dir", DRUMEE_DB_DIR, '/srv/db'],
+    ["domain_desc", DRUMEE_DESCRIPTION, 'My Drumee Box'],
+    ["jitsi_root_dir", '/usr/share/jitsi-meet'],
+    ["max_body_size", MAX_BODY_SIZE, '10G'],
     ["nsupdate_key", NSUPDATE_KEY, nsupdate_key],
-    ["admin_email", args.admin_email],
-    ["credential_dir", Template.chroot('etc/drumee/credential')],
-    ["domain_desc", args.description, 'My Drumee Box'],
-    ["max_body_size", args.max_body_size, '10G'],
-    ["drumee_root", args.drumee_root, "/var/lib/drumee"],
-    ["use_email", use_email, 0],
-    ["db_dir", args.db_dir, '/var/lib/mysql'],
-    ["backup_storage", args.backup_storage, ""],
-    ["data_dir", args.data_dir, '/var/lib/drumee/data'],
-    ["http_port", args.http_port, 80],
-    ["https_port", args.https_port, 443],
+    ["private_domain", PRIVATE_DOMAIN],
+    ["private_ip4", private_ip4],
+    ["private_port", DRUMEE_LOCAL_PORT],
+    ["public_domain", public_domain],
+    ["public_http_port", DRUMEE_HTTP_PORT],
+    ["public_https_port", DRUMEE_HTTPS_PORT],
+    ["public_ip4", public_ip4],
+    ["public_ip6", public_ip6],
+    ["storage_backup", backup_storage], /** Legacy */
   ]
-
-  if (!args.localhost) {
-    opt.push(
-      ["private_ip4", args.private_ip4],
-      ["public_domain", args.public_domain],
-      ["public_ip4", args.public_ip4],
-      ["public_ip6", args.public_ip6],
-      ["storage_backup", args.backup_storage], /** Legacy */
-      ["private_domain", args.private_domain],
-      ["acme_dir", ACME_DIR],
-      ["acme_email_account", ACME_EMAIL_ACCOUNT, args.admin_email],
-      ["certs_dir", CERTS_DIR],
-    )
-
-  }
-
   let data = makeData(opt);
-
   if (!data) {
     exit(1);
   }
@@ -339,27 +382,18 @@ function getSysConfigs() {
     return configs;
   }
 
+  /** Settings designed to be used by the backend server */
+  configs.domain = public_domain || private_domain;
+  configs.public_domain = public_domain;
+  configs.private_domain = private_domain;
+  configs.main_domain = data.domain;
+  configs.domain_name = data.domain;
+  configs.log_dir = data.log_dir;
+  
   configs.socketPath = getSocketPath();
-  configs.runtime_dir = join(configs.drumee_root, 'runtime');
-  configs.server_dir = join(configs.runtime_dir, 'server');
-  configs.server_base = configs.server_dir;
-  configs.server_home = join(configs.server_base, 'main');
-  configs.server_location = configs.server_home;
-
-  //console.log(configs)
-  configs.ui_dir = join(configs.runtime_dir, 'ui');
-  configs.ui_base = join(configs.ui_dir, 'main');
-  configs.ui_home = configs.ui_base;
-  configs.ui_location = configs.ui_base;
-
-  configs.tmp_dir = join(configs.runtime_dir, 'tmp');
-  configs.static_dir = join(configs.runtime_dir, 'static');
-
   let filename = Template.chroot("etc/drumee/drumee.json");
-  console.log("Writing main conf into drumee.json", filename);
   Template.makedir(dirname(filename));
   writeFileSync(filename, configs, JSON_OPT);
-  console.log(configs)
   return configs;
 }
 
@@ -430,17 +464,21 @@ function getDkim(file) {
  *
  */
 function writeInfraConf(data) {
-
+  writeEcoSystem(data);
   const etc = 'etc';
   const nginx = join(etc, 'nginx');
   const drumee = join(etc, 'drumee');
   const bind = join(etc, 'bind');
   const libbind = join('var', 'lib', 'bind');
-  const postfix = join(etc, 'postfix');
+  const postfix = join(etc, 'postfix',);
   const mariadb = join(etc, 'mysql', 'mariadb.conf.d');
   const infra = join(drumee, 'infrastructure');
-  const { public_domain, private_domain } = data;
+  let { certs_dir, public_domain, private_domain, jitsi_private_domain, jits_public_domain } = data;
   let targets = [
+
+    // Nginx 
+
+    // Drumee 
     `${drumee}/drumee.sh`,
     `${drumee}/conf.d/drumee.json`,
     `${drumee}/conf.d/exchange.json`,
@@ -448,46 +486,20 @@ function writeInfraConf(data) {
     `${drumee}/conf.d/drumee.json`,
     `${drumee}/conf.d/myDrumee.json`,
 
-    `${infra}/mfs.conf`,
-    `${infra}/routes/main.conf`,
-    `${infra}/internals/accel.conf`,
+    `${bind}/named.conf.log`,
+    `${bind}/named.conf.options`,
+    `${mariadb}/50-server.cnf`,
+    `${mariadb}/50-client.cnf`,
+    `${bind}/named.conf.local`,
   ];
 
-  if (args.localhost) {
-    let { username } = userInfo();
-    let system_group = username;
-    if (username = 'root') {
-      username = data.system_user || 'www-data';
-      system_group = data.system_group || 'www-data';
-    }
-    data.system_user = username;
-    data.system_group = system_group;
-    targets.push(`${nginx}/sites-enabled/localhost.conf`)
-    let dir = join(args.drumee_root, 'cache', 'localhost')
-    mkdirSync(dir, { recursive: true });
-    if (args.db_dir != '/var/lib/mysql') {
-      targets.push(
-        `${mariadb}/50-server.cnf`,
-        `${mariadb}/50-client.cnf`,
-      )
-    }
-  } else {
-    targets.push(
-      `${bind}/named.conf.log`,
-      `${bind}/named.conf.options`,
-      `${mariadb}/50-server.cnf`,
-      `${mariadb}/50-client.cnf`,
-    )
-  }
-
-  writeEcoSystem(data);
   if (data.public_ip4 && public_domain) {
-    let dir = join(args.drumee_root, 'cache', public_domain)
-    mkdirSync(dir, { recursive: true });
     targets.push(
-      `${nginx}/sites-enabled/public.conf`,
+      `${infra}/internals/accel.public.conf`,
+      `${infra}/mfs.public.conf`,
+      `${infra}/routes/public.conf`,
+      `${nginx}/sites-enabled/01-public.conf`,
       `${drumee}/ssl/public.conf`,
-      `${bind}/named.conf.public`,
       { tpl: `${libbind}/public.tpl`, out: `${libbind}/${public_domain}` },
       { tpl: `${libbind}/public-reverse.tpl`, out: `${libbind}/${data.public_ip4}` }
     );
@@ -510,51 +522,141 @@ function writeInfraConf(data) {
   }
 
   if (data.private_ip4 && private_domain) {
-    let dir = join(args.drumee_root, 'cache', private_domain)
-    mkdirSync(dir, { recursive: true });
     targets.push(
-      `${nginx}/sites-enabled/private.conf`,
+      `${infra}/internals/accel.private.conf`,
+      `${infra}/mfs.private.conf`,
+      `${infra}/routes/private.conf`,
+      `${nginx}/sites-enabled/02-private.conf`,
       `${drumee}/ssl/private.conf`,
-      `${bind}/named.conf.private`,
+      {
+        tpl: `${drumee}/certs/private.cnf`,
+        out: `${certs_dir}/${private_domain}_ecc/${private_domain}.cnf`
+      },
       { tpl: `${libbind}/private.tpl`, out: `${libbind}/${private_domain}` },
-      { tpl: `${libbind}/private-reverse.tpl`, out: `${libbind}/${data.private_ip4}` },
+      { tpl: `${libbind}/private-reverse.tpl`, out: `${libbind}/${data.private_ip4}` }
     )
   }
 
+  if (jitsi_private_domain) {
+    targets.push(
+      {
+        tpl: `${drumee}/certs/jitsi.private.cnf`,
+        out: `${certs_dir}/${jitsi_private_domain}_ecc/${jitsi_private_domain}.cnf`
+      },
+    )
+  }
 
   writeTemplates(data, targets);
 
-  if (!args.localhost) {
-    writeCredentials("postfix", {
-      host: 'localhost',
-      user: data.mail_user,
-      password: data.mail_password,
-    })
+  writeCredentials("postfix", {
+    host: 'localhost',
+    user: data.mail_user,
+    password: data.mail_password,
+  })
 
-    writeCredentials("db", {
-      password: uniqueId(),
-      user: "drumee-app",
-      host: "localhost",
-    })
+  writeCredentials("db", {
+    password: uniqueId(),
+    user: "drumee-app",
+    host: "localhost",
+  })
 
-    writeCredentials("email", {
-      host: `localhost`,
-      port: 587,
-      secure: false,
-      auth: {
-        user: `butler@${public_domain}`,
-        pass: uniqueId()
-      },
-      tls: {
-        rejectUnauthorized: false
-      }
-    })
+  writeCredentials("email", {
+    host: `localhost`,
+    port: 587,
+    secure: false,
+    auth: {
+      user: `butler@${public_domain}`,
+      pass: uniqueId()
+    },
+    tls: {
+      rejectUnauthorized: false
+    }
+  })
 
-    copyConfigs([
-      'etc/postfix/master.cf',
-      'etc/cron.d/drumee',
-    ])
-  }
+  copyConfigs([
+    'etc/postfix/master.cf',
+    'etc/cron.d/drumee',
+  ])
+}
+
+/**
+ * 
+ * @param {*} targets 
+ * @param {*} type 
+ */
+function addJitsiConfigsFiles(targets, data, type = 'private') {
+  const etc = 'etc';
+  const jitsi = join(etc, 'jitsi');
+  const nginx = join(etc, 'nginx');
+  const prosody = join(etc, 'prosody');
+  const drumee = join(etc, 'drumee');
+
+  const domain = data[`jitsi_${type}_domain`];
+  targets.push(
+    {
+      tpl: `${jitsi}/jicofo/jicofo.${type}.conf`,
+      out: `${jitsi}/jicofo/jicofo.conf`,
+    },
+    {
+      tpl: `${jitsi}/jicofo/sip-cmmunicator.${type}.properties`,
+      out: `${jitsi}/jicofo/sip-cmmunicator.properties`
+    },
+    `${jitsi}/videobridge/jvb.${type}.conf`,
+    `${jitsi}/ssl.${type}.conf`,
+    `${jitsi}/meet.${type}.conf`,
+    `${jitsi}/web/config.${type}.js`,
+    `${nginx}/sites-enabled/20-jitsi.${type}.conf`,
+    `${nginx}/modules-enabled/90-turn-relay.${type}.conf`,
+    {
+      tpl: `${prosody}/conf.d/${type}.cfg.lua`,
+      out: `${prosody}/conf.d/${domain}.cfg.lua`,
+    },
+    `${etc}/turnserver.${type}.conf`,
+    {
+      tpl: `${drumee}/conf.d/conference.${type}.json`,
+      out: `${drumee}/conf.d/${domain}.json`,
+    },
+  )
+}
+
+/**
+ * 
+ * @param {*} targets 
+ * @param {*} type 
+ */
+function _addDrumeeConfigsFiles(targets, data, type = 'private') {
+  const etc = 'etc';
+  const jitsi = join(etc, 'jitsi');
+  const nginx = join(etc, 'nginx');
+  const prosody = join(etc, 'prosody');
+  const drumee = join(etc, 'drumee');
+
+  const domain = data[`jitsi_${type}_domain`];
+  targets.push(
+    {
+      tpl: `${jitsi}/jicofo/jicofo.${type}.conf`,
+      out: `${jitsi}/jicofo/jicofo.conf`,
+    },
+    {
+      tpl: `${jitsi}/jicofo/sip-cmmunicator.${type}.properties`,
+      out: `${jitsi}/jicofo/sip-cmmunicator.properties`
+    },
+    `${jitsi}/videobridge/jvb.${type}.conf`,
+    `${jitsi}/ssl.${type}.conf`,
+    `${jitsi}/meet.${type}.conf`,
+    `${jitsi}/web/config.${type}.js`,
+    `${nginx}/sites-enabled/20-jitsi.${type}.conf`,
+    `${nginx}/modules-enabled/90-turn-relay.${type}.conf`,
+    {
+      tpl: `${prosody}/conf.d/${type}.cfg.lua`,
+      out: `${prosody}/conf.d/${domain}.cfg.lua`,
+    },
+    `${etc}/turnserver.${type}.conf`,
+    {
+      tpl: `${drumee}/conf.d/conference.${type}.json`,
+      out: `${drumee}/conf.d/${domain}.json`,
+    },
+  )
 }
 
 /**
@@ -563,45 +665,27 @@ function writeInfraConf(data) {
 function writeJitsiConf(data) {
   const etc = 'etc';
   const jitsi = join(etc, 'jitsi');
-  const nginx = join(etc, 'nginx');
   const prosody = join(etc, 'prosody');
   const drumee = join(etc, 'drumee');
   let targets = [
-    // Jicofo
     `${jitsi}/jicofo/config`,
-    `${jitsi}/jicofo/jicofo.conf`,
     `${jitsi}/jicofo/logging.properties`,
-
-    // Jitsi Video Bridge 
     `${jitsi}/videobridge/config`,
-    `${jitsi}/videobridge/jvb.conf`,
     `${jitsi}/videobridge/logging.properties`,
-
-    // Jitsi meet
-    `${jitsi}/ssl.conf`,
-    `${jitsi}/meet.conf`,
-    `${jitsi}/web/config.js`,
     `${jitsi}/web/interface_config.js`,
     `${jitsi}/web/defaults/ffdhe2048.txt`,
-
-    // Nginx 
-    `${nginx}/sites-enabled/jitsi.conf`,
-    `${nginx}/modules-enabled/90-turn-relay.conf`,
-
-    // Prosody 
-    `${prosody}/prosody.cfg.lua`,
     `${prosody}/defaults/credentials.sh`,
-    {
-      out: `${prosody}/conf.d/${data.jitsi_domain}.cfg.lua`,
-      tpl: `${prosody}/conf.d/vhost.cfg.lua`
-    },
-    // `${prosody}/migrator.cfg.lua`,
-
-    // Turnserver 
-    `${etc}/turnserver.conf`,
-
-    `${drumee}/conf.d/conference.json`,
+    `${prosody}/prosody.cfg.lua`,
   ];
+  if (data.public_domain) {
+    addJitsiConfigsFiles(targets, data, `public`)
+  } else if (data.private_domain) {
+    addJitsiConfigsFiles(targets, data, `private`)
+  } else {
+    console.error(" No domain name available!")
+    return
+  }
+
   writeTemplates(data, targets);
 
 }
@@ -610,8 +694,10 @@ function writeJitsiConf(data) {
  *
  */
 function makeConfData(data) {
+  const endpoint_name = "main";
   data = {
     ...data,
+    endpoint_name,
     turn_sercret: randomString(),
     prosody_plugins: "/usr/share/jitsi-meet/prosody-plugins/",
     xmpp_password: randomString(),
@@ -621,16 +707,13 @@ function makeConfData(data) {
     jvb_password: randomString(),
     app_id: randomString(),
     app_password: randomString(),
-    ui_base: join(data.ui_base, 'main'),
+    ui_base: join(data.ui_base, endpoint_name),
     location: '/-/',
     pushPort: 23000,
     restPort: 24000,
   };
   if (!data.export_dir) data.export_dir = null;
   if (!data.import_dir) data.import_dir = null;
-  if (!data.private_address) {
-    data.private_address = data.public_address || "127.0.0.1";
-  }
   return data
 }
 
@@ -651,6 +734,7 @@ async function getAddresses(data) {
   let os = require("os");
   let interfaces = os.networkInterfaces();
   let private_ip4, public_ip4, private_ip6, public_ip6;
+  let private_if4, private_subnet_mask, private_broadcast_address;
   for (let name in interfaces) {
     if (name == 'lo') continue;
     for (let dev of interfaces[name]) {
@@ -658,6 +742,21 @@ async function getAddresses(data) {
         case 'IPv4':
           if (isPrivate(dev.address) && !private_ip4) {
             private_ip4 = dev.address;
+            private_if4 = name;
+            private_subnet_mask = dev.netmask;
+            let a = private_ip4.split('.');
+            let b = private_subnet_mask.split('.');
+            let i = 0;
+            let br = [];
+            for (let c of b) {
+              if (c == '255') {
+                br.push(a[i])
+              }else{
+                br.push('255')
+              }
+              i++;
+            }
+            private_broadcast_address = br.join('.')
           }
           if (!isPrivate(dev.address) && !public_ip4) {
             public_ip4 = dev.address;
@@ -674,16 +773,47 @@ async function getAddresses(data) {
       }
     }
   }
-  data.private_ip4 = data.private_ip4 || private_ip4;
-  data.private_ip6 = data.private_ip6 || private_ip6;
-  data.local_address = data.private_ip4;
 
-  data.public_ip4 = data.public_ip4 || public_ip4;
-  data.public_ip6 = data.public_ip6 || public_ip6;
+  data.private_ip6 = args.private_ip6 || PRIVATE_IP6 || private_ip6;
+  data.private_ip4 = args.private_ip4 || PRIVATE_IP4 || private_ip4;
+  data.private_if4 = args.private_ip4 || PRIVATE_IF4 || private_if4;
+  data.private_if4 = args.private_ip4 || PRIVATE_IF4 || private_if4;
+  data.private_broadcast_address = private_broadcast_address || '255.255.255.255';
+  data.private_subnet_mask = private_subnet_mask || '255.255.255.0';
+
+  data.public_ip4 = args.public_ip4 || PUBLIC_IP4 || public_ip4;
+  data.public_ip6 = args.public_ip6 || PUBLIC_IP6 || public_ip6;
+
+  /** Named extra settings */
+  data.allow_recursion = 'localhost;';
+
+  if (data.public_ip4) {
+    data.allow_recursion = `${data.allow_recursion} ${data.public_ip4};`
+    let a = data.public_ip4.split('.');
+    a.pop();
+    data.reverse_public_ip4 = a.reverse().join('.');
+  } else {
+    data.reverse_public_ip4 = ""
+  }
+
+  if (!data.public_ip6) {
+    data.public_ip6 = "";
+  }
+  if (data.private_ip4) {
+    data.allow_recursion = `${data.allow_recursion} ${data.private_ip4};`
+    let a = data.private_ip4.split('.');
+    a.pop();
+    data.reverse_private_ip4 = a.reverse().join('.');
+  } else {
+    data.reverse_private_ip4 = ""
+  }
+
+  if (!data.public_ip6) {
+    data.public_ip6 = "";
+  }
 
   return data;
 }
-
 /**
  *
  * @returns
@@ -697,7 +827,7 @@ function main() {
     data = { ...data, ...makeConfData(data) };
     data = await getAddresses(data);
     let func = [];
-    if (args.only_infra || args.no_jitsi || args.localhost || data.local_domain) {
+    if (args.only_infra || args.no_jitsi) {
       func.push(writeInfraConf)
     } else {
       func = [writeInfraConf, writeJitsiConf];