Merge branch 'develop', prepare 0.21.0

Author: yamalight

README.md

@@ -69,6 +69,7 @@ Currently it contains list of users for basic auth, debug and letsencrypt settin
 debug: false # whether debug mode is enabled, default "false"
 letsencrypt: false # whether to enable letsencrypt, default "false"
 letsencryptEmail: your@email.com # email used for letsencrypt
+compress: true # whether to apply gzip compression, default "true"
 baseDomain: false # base domain to use for deployments without domains specified, default "false"
 publicKeysPath: '/path/to/your/public/keys' # path to folder with authorized_keys, default "~/.ssh"
 ```

src/config/index.js

@@ -31,6 +31,7 @@ const defaultConfig = {
   debug: false,
   letsencrypt: false,
   letsencryptEmail: 'admin@domain.com',
+  compress: true,
   baseDomain: false,
   publicKeysPath,
 };

src/docker/init.js

@@ -104,20 +104,25 @@ exports.initDocker = async () => {
     `--acme.email=${config.letsencryptEmail}`,
     '--acme.storage=/var/acme/acme.json',
     '--acme.entrypoint=https',
-    '--acme.ondemand=true',
     '--acme.onhostrule=true',
     '--accesslogsfile=/var/acme/access.log',
-    '--entryPoints=Name:https Address::443 TLS',
-    '--entryPoints=Name:http Address::80 Redirect.EntryPoint:https',
-    '--defaultEntryPoints=http,https',
+    `--entryPoints=Name:https Address::443 TLS ${config.compress ? 'Compress:on' : 'Compress:off'}`,
+    `--entryPoints=Name:http Address::80 Redirect.EntryPoint:https ${config.compress ? 'Compress:on' : 'Compress:off'}`,
+    '--defaultEntryPoints=https,http',
+  ];
+
+  // entrypoints without letsencrypt
+  const entrypoints = [
+    `--entryPoints=Name:http Address::80 ${config.compress ? 'Compress:on' : 'Compress:off'}`,
+    '--defaultEntryPoints=http',
   ];
 
   // construct command
   const Cmd = [
     '-c',
     '/dev/null',
     '--docker',
-    ...(config.letsencrypt ? letsencrypt : []),
+    ...(config.letsencrypt ? letsencrypt : entrypoints),
     ...(config.debug ? debug : []),
   ];