not-node 6.5.42 → 6.5.44

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "not-node",
-	"version": "6.5.42",
+	"version": "6.5.44",
 	"description": "node complimentary part for client side notFramework.",
 	"main": "index.js",
 	"scripts": {

package/src/cli/lib/messages.mjs

@@ -12,10 +12,10 @@ function postStartupInstructions(siteDir, config) {
                 `For '${env}' environment exec while in project directory:`
             );
             console.log(
-                `$ sudo cp nginx/${env}.conf to /var/nginx/sites-available/${config.hostname[env]}.conf`
+                `$ sudo cp nginx/${env}.conf /etc/nginx/sites-available/${config.hostname[env]}.conf`
             );
             console.log(
-                `$ sudo ln -s /var/nginx/sites-available/${config.hostname[env]}.conf /var/nginx/sites-enabled/${config.hostname[env]}.conf`
+                `$ sudo ln -s /etc/nginx/sites-available/${config.hostname[env]}.conf /etc/nginx/sites-enabled/${config.hostname[env]}.conf`
             );
         }
         console.log("2. Restart NGINX server");

package/tmpl/dirs/project.mjs

@@ -11,8 +11,29 @@ export default {
     pm2: {
         ifArgs: ["pm2"],
     },
-    ".env": {
-        tmpl: "project/env.ejs",
-        args: ["init_root_user", "not_node_monitor", "not_node_reporter"],
+    ".envs": {
+        content: {
+            development: {
+                tmpl: "project/env.ejs",
+                args: [
+                    "init_root_user",
+                    "not_node_monitor",
+                    "not_node_reporter",
+                    "db",
+                    "session",
+                    "secret",
+                    "modules",
+                    "ws",
+                ],
+            },
+            stage: {
+                tmpl: "project/env.ejs",
+                args: [],
+            },
+            production: {
+                tmpl: "project/env.ejs",
+                args: [],
+            },
+        },
     },
 };

package/tmpl/files/app/config/common.ejs

@@ -17,9 +17,7 @@
           "useNewUrlParser": true,
           "useUnifiedTopology": true,
           "db": "<%- db.mongoose.db %>",
-          "host": "<%- db.mongoose.hostname %>",
-          "user": "<%- db.mongoose.user %>",
-          "pass": "<%- db.mongoose.pass %>",
+          "host": "<%- db.mongoose.hostname %>",          
           "autoIndex": false
         }
       },
@@ -37,7 +35,6 @@
     <% if (session){ %>
     "session": {
       "driver": "<%- session.driver %>",
-      "secret": "<%- session.secret %>",
       "cookie": {
         "maxAge": <%- session.ttl %>
       },
@@ -69,8 +66,7 @@
           "main": {
             "connection": {
               "port": <%- ws.port %>,
-              "secure": <%= ws.secure %>,
-              "secret": "<%- secret %>"
+              "secure": <%= ws.secure %>
             }
           }
         }
@@ -85,8 +81,7 @@
         "debug":{
           "loaded": false
         },
-        "tokenTTL": <%= user.tokenTTL %>,
-        "secret": "<%- secret %>",
+        "tokenTTL": <%= user.tokenTTL %>,        
         "roles": {
           "primary": [<%- roles.map(entry => `"${entry}"`).join(",") %>],
           "secondary": [<%- rolesSecondary.map(entry => `"${entry}"`).join(",") %>]
@@ -126,4 +121,4 @@
     <%- modules.map(entry => `"${entry}"`).join(',') %>    
     ]
   }
-  
+  

package/tmpl/files/project/env.ejs

@@ -14,3 +14,21 @@ INIT_ROOT_USERNAME=<%- init_root_user.name %>
 INIT_ROOT_EMAIL=<%- init_root_user.email %>
 INIT_ROOT_PASSWORD=<%- init_root_user.password %>
 <% } %>
+
+<% if (db && db.mongoose) { %>
+db__mongoose__uri=mongodb://<%- db.mongoose.host %>/<%- db.mongoose.db %>?authSource=<%- db.mongoose.authSource %>
+db__mongoose__options__host=<%- db.mongoose.host %>
+db__mongoose__options__user=<%- db.mongoose.user %>
+db__mongoose__options__pass=<%- db.mongoose.pass %>
+db__mongoose__options__db=<%- db.mongoose.db %>
+<% } %>
+
+<% if (modules.includes('not-ws') && ws) { %>
+modules__ws__servers__main__connection__secret=<%- secret %>
+<% } %>
+<% if (modules.includes('not-user') && user) { %>
+modules__user__secret=<%- secret %>
+<% } %>
+<% if (session) { %>
+session__secret=<%- session.secret %>
+<% } %>