minor

iliakan · iliakan · commit b6868ff324f2 · 2018-06-14T14:06:20.000+03:00
diff --git a/INSTALL.md b/INSTALL.md
@@ -104,7 +104,7 @@ Also it's recommended to add this line to `/etc/hosts`:
 
 This host name is in the Nginx config already.
 
-## 7.1. Если Nginx у вас уже стоит
+## 7.1. If node.js is installed already
 
 If you already have nginx, make a backup of it's config files.
 
@@ -143,13 +143,13 @@ That requires to setup a plnkr session, and is not necessary to run the tutorial
 
 Run the site with the language in `NODE_LANG` variable:
 ```
-HOST=127.0.0.1 PORT=80 NODE_LANG=en ./dev
+HOST=127.0.0.1 PORT=80 ./dev en
 ```
 
 Or with default host 127.0.0.1 and port 3000:
 
 ```
-NODE_LANG=en ./dev
+./dev en
 ```
 
 Then access the site.
@@ -161,7 +161,7 @@ If you have `127.0.0.1 javascript.in` in `/etc/hosts`, then the address will be
 In "Edit" mode the engine watches the tutorial directory, instantly picks the changes and reloads the page. Good for editing.
 
 ```
-PLUNK_REMOTE_OFF=1 NODE_LANG=en ./edit
+./edit en
 ```
 
 This uses the default `HOST=127.0.0.1`, `PORT=3000`, and the folder is `/js/javascript-tutorial-en`.
diff --git a/dev b/dev
@@ -1,3 +1,13 @@
 #!/bin/bash
 
-ASSET_VERSIONING=query NODE_ENV=development WATCH=1 npm --silent run gulp dev | bunyan -o short -l debug
+: ${1?"Usage: $0 <language>"}
+
+set -e
+
+export NODE_LANG=$1
+export NODE_ENV=development
+export ASSET_VERSIONING=query
+export WATCH=1
+export SITE_HOST=http://javascript.in
+npm --silent run gulp dev | bunyan -o short -l debug
+
diff --git a/edit b/edit
@@ -1,10 +1,13 @@
 #!/bin/bash
 
+: ${1?"Usage: $0 <language>"}
+
 BRANCH="${1:-$NODE_LANG}"
 
 export NODE_LANG=$BRANCH
 export NODE_ENV=production
 export TUTORIAL_EDIT=1
+export PLUNK_REMOTE_OFF=1
 
 npm --silent run -- gulp tutorial:import --root /js/javascript-tutorial-$BRANCH
 npm --silent run -- gulp edit --root /js/javascript-tutorial-$BRANCH
diff --git a/modules/config/mongoose.js b/modules/config/mongoose.js
@@ -1,14 +1,15 @@
+let host = process.env.MONGO_HOST || 'localhost';
+let db = process.env.NODE_ENV == 'test' ? "js_test" : `js_${process.env.NODE_LANG}`;
+
 module.exports = {
-  "uri":     "mongodb://localhost/" + (
-    process.env.NODE_ENV == 'test' ? "js_test" : `js_${process.env.NODE_LANG}`
-  ),
-  "options": {
-    "server": {
-      "socketOptions": {
-        "keepAlive": 1
-      },
-      "poolSize":      5
-    }
+  uri: 'mongodb://' + host + "/" + db,
+  options: {
+    keepAlive: true,
+    reconnectTries: 10,
+    socketTimeoutMS: 10000,
+    connectTimeoutMS: 10000,
+    poolSize: 5,
+    promiseLibrary: global.Promise
   }
 };
 
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
