@drumee/setup-infra 1.0.8 → 1.0.10

package/index.js

@@ -227,9 +227,16 @@ function makeData(opt) {
       if (/.+\+$/.test(value)) {
         value = value.replace(/\+$/, data[key]);
       }
-      data[key] = value.trim() || fallback;
+      if(value){
+        data[key] = value.trim() || fallback;
+      }
     }
   }
+
+  if(data.public_ip4){
+    data.reverse_ip4 = data.public_ip4.split('.').reverse().join('.');
+  }
+
   return data;
 }
 /**
@@ -401,6 +408,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 +547,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.8",
+  "version": "1.0.10",
   "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/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 %>.