Merge branch 'develop', prepare 4.0.2

Author: yamalight

.gitignore

@@ -6,3 +6,4 @@ test/fixtures/deploying/
 test/fixtures/secrets.db
 dist/
 bin/server-core.js
+bin/home.html

.travis.yml

@@ -19,6 +19,7 @@ after_success:
   # build npm binary
   - yarn build-bundle
   - mv dist/index.js bin/server-core.js
+  - mv dist/home.html bin/home.html
   # build main docker image
   - yarn build
   - docker login -u $HUB_USER -p $HUB_PASS
@@ -37,12 +38,20 @@ env:
     - secure: UFbvYkcpk5tpnmepegcIaYlThaVTeHHbVwnMUc5YWaP9dVTPXLQhOuvJQeZtf6zKc2VnOWeAyhOZqGipN7bTsAeO+50BOUQpEh1vu6AHY2+LHu1KBnR11ZATuOeqJFnki9gVEr5L99ALGT6/0bSMv5XJuZuzVn5nPJVGnerk7XDXTlmWIq+OW9fUeXnW0cHfO9GvA9cDEC4dojS8ltIRPJQwCqzgCxkYivXlNtjeuBfY/C/T615xwRPRF9v1ENBetfKB/csfKpVvyJ3/JW8hkiV67t8e+9WzA/ZxxFt8qb4s2ECOIDYeLlV2210TTwncRzeNYyzHJwmPr8gVvAX73QFTIA6kI1ywxBxqhRhLhjIu8nnc18sizKoCaqU03New2vjKZKEfkUQK6RGz6IIJOK/fSvU7zaahosqEtGhAca5fovcz0HK5icoQ72mSgoMRY8WXwGJYTYTdQ2Lcxsy0k7KU/MsXS2traYH0qUZ8De5xD2RXMqjn1z35Gm/47/GZXFzn0gTqRbh1Kv17vTxtz6qvoCqZPN9uq0H29LxfOFgNabQEJhTMmZXhZgth4AaUYBxeKwbjwBaceCzFTwwLVqU4YsfkVGzj+AqpiVDZREIsJc6vkZbKymafSMj5jsXtfJfMLMPsMnBi8REgG8yewq2iBPkGO0ClEzCNcHvkEjQ=
 
 deploy:
-  provider: npm
-  skip_cleanup: true
-  email: [email protected]
-  api_key:
-    secure: jx1saIbfvgwhhRJiNv0zlSGoCncgsyZCHTJM4GBmD832JB3TG8NPJJM3YRorZh+Z8UdIbqshYMfrxLkD7YrerHdC69c3ruLPc9XjThIYKpNSIUB++VH6aeGWk33KLuTFo9F2w9ByXWlyYGGapM75zfrj6nfmbCV6nBJDz6ecUC1j06l1l+V9p+JCbbcd0W7PEIzYlWCtDa7Ix8sPYK0sU7tHbBdQJB9t1Bn9sPJ/g3Qyb1DBBSHkG4UhZyXNQYyF0+GVgSYsXwzkxVJqN7K6HtEYmzRL57sLlDtk5yK9Fd5xyV0OSo3diWw6VOoywqHtznVSX1LSLfiapdYq9tQyvxqPYBA7lTtBpqQ+7iTWb0Mpp2ozhlM00LGyKiWxX6OgrveBbQcJS4GTVDkdPzZB8DSh+MsGA2nSJD4hHu0WdsLdUNIhHXV937LDbuPozngbxpm6jj2BU+cnIuaeoKyLh29Kke1dIrj2pFy3Rnki/LdPoZ6sXLn4AqEi4Iish5rPdMfVZ+Emd+H59R0MBc/N6/lmWtiFowDyuOBNYDFJc1SF0Fgs1oIMZqVv7gUMkMKg9zSZFDbFo2nuQzu/W7uGujA9Ry6u2l3Tx2Gya4Anlm+ebIDeK042EeXNx1HU8SPmP4QEKPQfQyjauxIZ9t/Mk1NAAEYuIRwSIOr0Akxs0Ng=
-  on:
-    repo: exoframejs/exoframe-server
-    all_branches: true
-    condition: $TRAVIS_BRANCH =~ ^master|develop$
+  - provider: npm
+    skip_cleanup: true
+    email: [email protected]
+    api_key:
+      secure: jx1saIbfvgwhhRJiNv0zlSGoCncgsyZCHTJM4GBmD832JB3TG8NPJJM3YRorZh+Z8UdIbqshYMfrxLkD7YrerHdC69c3ruLPc9XjThIYKpNSIUB++VH6aeGWk33KLuTFo9F2w9ByXWlyYGGapM75zfrj6nfmbCV6nBJDz6ecUC1j06l1l+V9p+JCbbcd0W7PEIzYlWCtDa7Ix8sPYK0sU7tHbBdQJB9t1Bn9sPJ/g3Qyb1DBBSHkG4UhZyXNQYyF0+GVgSYsXwzkxVJqN7K6HtEYmzRL57sLlDtk5yK9Fd5xyV0OSo3diWw6VOoywqHtznVSX1LSLfiapdYq9tQyvxqPYBA7lTtBpqQ+7iTWb0Mpp2ozhlM00LGyKiWxX6OgrveBbQcJS4GTVDkdPzZB8DSh+MsGA2nSJD4hHu0WdsLdUNIhHXV937LDbuPozngbxpm6jj2BU+cnIuaeoKyLh29Kke1dIrj2pFy3Rnki/LdPoZ6sXLn4AqEi4Iish5rPdMfVZ+Emd+H59R0MBc/N6/lmWtiFowDyuOBNYDFJc1SF0Fgs1oIMZqVv7gUMkMKg9zSZFDbFo2nuQzu/W7uGujA9Ry6u2l3Tx2Gya4Anlm+ebIDeK042EeXNx1HU8SPmP4QEKPQfQyjauxIZ9t/Mk1NAAEYuIRwSIOr0Akxs0Ng=
+    on:
+      repo: exoframejs/exoframe-server
+      tags: true
+  - provider: npm
+    skip_cleanup: true
+    tag: next
+    email: [email protected]
+    api_key:
+      secure: jx1saIbfvgwhhRJiNv0zlSGoCncgsyZCHTJM4GBmD832JB3TG8NPJJM3YRorZh+Z8UdIbqshYMfrxLkD7YrerHdC69c3ruLPc9XjThIYKpNSIUB++VH6aeGWk33KLuTFo9F2w9ByXWlyYGGapM75zfrj6nfmbCV6nBJDz6ecUC1j06l1l+V9p+JCbbcd0W7PEIzYlWCtDa7Ix8sPYK0sU7tHbBdQJB9t1Bn9sPJ/g3Qyb1DBBSHkG4UhZyXNQYyF0+GVgSYsXwzkxVJqN7K6HtEYmzRL57sLlDtk5yK9Fd5xyV0OSo3diWw6VOoywqHtznVSX1LSLfiapdYq9tQyvxqPYBA7lTtBpqQ+7iTWb0Mpp2ozhlM00LGyKiWxX6OgrveBbQcJS4GTVDkdPzZB8DSh+MsGA2nSJD4hHu0WdsLdUNIhHXV937LDbuPozngbxpm6jj2BU+cnIuaeoKyLh29Kke1dIrj2pFy3Rnki/LdPoZ6sXLn4AqEi4Iish5rPdMfVZ+Emd+H59R0MBc/N6/lmWtiFowDyuOBNYDFJc1SF0Fgs1oIMZqVv7gUMkMKg9zSZFDbFo2nuQzu/W7uGujA9Ry6u2l3Tx2Gya4Anlm+ebIDeK042EeXNx1HU8SPmP4QEKPQfQyjauxIZ9t/Mk1NAAEYuIRwSIOr0Akxs0Ng=
+    on:
+      repo: exoframejs/exoframe-server
+      branch: develop

package.json

@@ -1,6 +1,6 @@
 {
   "name": "exoframe-server",
-  "version": "4.0.0",
+  "version": "4.0.2-dev",
   "description": "Exoframe is a self-hosted tool that allows simple one-command deployments using Docker",
   "main": "bin/server-core.js",
   "bin": "bin/exoframe-server.js",
@@ -16,7 +16,8 @@
   },
   "files": [
     "bin/exoframe-server.js",
-    "bin/server-core.js"
+    "bin/server-core.js",
+    "bin/home.html"
   ],
   "repository": "[email protected]:exoframejs/exoframe-server.git",
   "author": "Tim Ermilov <[email protected]>",