@scandipwa/magento-scripts 1.14.1-alpha.8 → 1.14.1-alpha.9

package/lib/config/docker.js

@@ -54,7 +54,7 @@ module.exports = async ({ configuration, ssl, host }, config) => {
             name: `${ prefix }_nginx-data`,
             opts: {
                 type: 'nfs',
-                device: `${ path.join(cacheDir, 'nginx', 'conf.d') }`,
+                device: path.join(cacheDir, 'nginx', 'conf.d'),
                 o: 'bind'
             }
         };
@@ -62,7 +62,7 @@ module.exports = async ({ configuration, ssl, host }, config) => {
             name: `${ prefix }_pub-data`,
             opts: {
                 type: 'nfs',
-                device: `${ path.join(magentoDir, 'pub') }`,
+                device: path.join(magentoDir, 'pub'),
                 o: 'bind'
             }
         };
@@ -70,7 +70,15 @@ module.exports = async ({ configuration, ssl, host }, config) => {
             name: `${ prefix }_setup-data`,
             opts: {
                 type: 'nfs',
-                device: `${ path.join(magentoDir, 'setup') }`,
+                device: path.join(magentoDir, 'setup'),
+                o: 'bind'
+            }
+        };
+        volumes.sslTerminator = {
+            name: `${ prefix }_ssl-terminator-data`,
+            opts: {
+                type: 'nfs',
+                device: path.join(cacheDir, 'ssl-terminator', 'conf.d'),
                 o: 'bind'
             }
         };
@@ -80,7 +88,7 @@ module.exports = async ({ configuration, ssl, host }, config) => {
                 name: `${ prefix }_varnish-data`,
                 opts: {
                     type: 'nfs',
-                    device: `${ path.join(cacheDir, 'varnish') }`,
+                    device: path.join(cacheDir, 'varnish'),
                     o: 'bind'
                 }
             };
@@ -89,6 +97,31 @@ module.exports = async ({ configuration, ssl, host }, config) => {
 
     const getContainers = (ports = {}) => {
         const dockerConfig = {
+            sslTerminator: {
+                _: 'SSL Terminator (Nginx)',
+                ports: isNotNativeLinux ? [
+                    `${ isIpAddress(host) ? host : '127.0.0.1' }:${ ports.sslTerminator }:80`
+                ] : [],
+                healthCheck: {
+                    cmd: 'service nginx status'
+                },
+                /**
+                 * Mount volumes directly on linux
+                 */
+                mountVolumes: [
+                    `${ isLinux ? path.join(cacheDir, 'ssl-terminator', 'conf.d') : volumes.sslTerminator.name }:/etc/nginx/conf.d`
+                ],
+                restart: 'on-failure:5',
+                // TODO: use connect instead
+                network: isNotNativeLinux ? network.name : 'host',
+                image: `nginx:${ nginx.version }`,
+                imageDetails: {
+                    name: 'nginx',
+                    tag: nginx.version
+                },
+                name: `${ prefix }_ssl-terminator`,
+                command: "nginx -g 'daemon off;'"
+            },
             nginx: {
                 _: 'Nginx',
                 ports: isNotNativeLinux ? [
@@ -216,10 +249,8 @@ module.exports = async ({ configuration, ssl, host }, config) => {
                     tag: varnish.version
                 },
                 name: `${ prefix }_varnish`,
-                mountVolumes: isLinux ? [
-                    `${ path.join(cacheDir, 'varnish') }:/etc/varnish`
-                ] : [
-                    `${ volumes.varnish.name }:/etc/varnish`
+                mountVolumes: [
+                    `${ isLinux ? path.join(cacheDir, 'varnish') : volumes.varnish.name }:/etc/varnish`
                 ],
                 ports: isNotNativeLinux ? [
                     `${ isIpAddress(host) ? host : '127.0.0.1' }:${ ports.varnish }:80`
@@ -229,7 +260,8 @@ module.exports = async ({ configuration, ssl, host }, config) => {
                 },
                 restart: 'on-failure:30',
                 network: isNotNativeLinux ? network.name : 'host',
-                command: `varnishd -F -a :${ isNotNativeLinux ? 80 : ports.varnish } -t 600 -f /etc/varnish/default.vcl`,
+                // eslint-disable-next-line max-len
+                command: `/bin/bash -c "varnishd -a :${ isNotNativeLinux ? 80 : ports.varnish } -t 600 -f /etc/varnish/default.vcl -s malloc,512m && varnishlog"`,
                 tmpfs: [
                     '/var/lib/varnish:exec'
                 ]

package/lib/config/get-port-config.js

@@ -26,6 +26,10 @@ const getAvailablePorts = () => ({
                     'utf-8'
                 )
             );
+            if (!ports.sslTerminator) {
+                ports.sslTerminator = ports.app;
+                ports.app = defaultPorts.app;
+            }
         }
         const {
             systemConfiguration: {
@@ -41,7 +45,7 @@ const getAvailablePorts = () => ({
             if (!isPortAvailable) {
                 throw new Error(`Port ${ctx.port} is not available`);
             } else {
-                availablePorts.app = ctx.port;
+                availablePorts.sslTerminator = ctx.port;
             }
         }
 

package/lib/config/port-config.js

@@ -54,8 +54,9 @@ const savePortsConfig = async (ports) => {
 
 // Map of default ports (key:value)
 const defaultPorts = {
-    app: 80,
+    app: 3031,
     varnish: 8080,
+    sslTerminator: 80,
     fpm: 9000,
     xdebug: 9111,
     mysql: 3306,

package/lib/config/ssl-terminator/index.js

@@ -0,0 +1,10 @@
+const path = require('path');
+
+const sslTerminator = ({ templateDir }) => ({
+    version: '1.18.0',
+    configTemplate: path.join(templateDir || '', 'ssl-terminator.template.conf')
+});
+
+module.exports = {
+    sslTerminator
+};

package/lib/config/templates/nginx.template.conf

@@ -1,8 +1,3 @@
-real_ip_header X-Forwarded-For;
-set_real_ip_from 10.0.0.0/8;
-set_real_ip_from 172.0.0.0/8;
-real_ip_recursive on;
-
 upstream fastcgi_backend {
     # use tcp connection
     server <%= it.hostMachine %>:<%= it.ports.fpm %>;
@@ -10,16 +5,7 @@ upstream fastcgi_backend {
 
 server {
     listen <%= it.hostPort %>;
-    <% if (it.config.ssl.enabled) { %>listen 443 ssl;<% } %>
-
-    <% if (it.config.ssl.enabled) { %>server_name <%= it.networkToBindTo %>;
-
-    ssl_certificate /etc/nginx/conf.d/ssl_certificate.pem;
-    ssl_certificate_key /etc/nginx/conf.d/ssl_certificate-key.pem;
-    ssl_protocols TLSv1.2;<% } else if (it.config.host) { %>server_name <%= it.config.host %>;
-    <% } else { %>
     server_name _;
-    <% } %>
 
     set $MAGE_ROOT <%= it.mageRoot %>;
     resolver 127.0.0.11;
@@ -39,16 +25,6 @@ server {
     }
 
     location / {
-        # proxy_set_header X-Real-IP $remote_addr;
-        # proxy_set_header X-Forwarded-For $remote_addr;
-        # proxy_set_header Host $http_host;
-
-        # if ($request_method = PURGE) {
-        #     rewrite ^/(.*)$  $1 break;
-        #     proxy_pass http://<%= it.hostMachine %>:<%= it.ports.varnish %>/;
-        #     break;
-        # }
-
         try_files $uri $uri/ /index.php$is_args$args;
     }
 
@@ -222,11 +198,4 @@ server {
     location @webp-to-jpg {
         rewrite ^(.*)\.webp$ $1.jpg last;
     }
-
-    # location @purgepass {
-    #     # some other configuration
-    #     proxy_pass http://<%= it.hostMachine %>:<%= it.ports.varnish %>;
-    #     proxy_set_header Host      $host;
-    #     proxy_set_header X-Real-IP $remote_addr;
-    # }
 }

package/lib/config/templates/ssl-terminator.template.conf

@@ -0,0 +1,27 @@
+real_ip_header X-Forwarded-For;
+set_real_ip_from 10.0.0.0/8;
+set_real_ip_from 172.0.0.0/8;
+real_ip_recursive on;
+
+server {
+    listen <%= it.hostPort %>;
+<% if (it.config.ssl.enabled) { %>  listen 443 ssl;
+    server_name <%= it.networkToBindTo %>;
+
+    ssl_certificate /etc/nginx/conf.d/ssl_certificate.pem;
+    ssl_certificate_key /etc/nginx/conf.d/ssl_certificate-key.pem;
+    ssl_protocols TLSv1.2;<% } %>
+
+    server_name <% if (it.config.host) { %><%= it.config.host %><% } else { %>_<% } %>;
+
+    location / {
+        proxy_buffer_size   128k;
+        proxy_buffers   4 256k;
+        proxy_busy_buffers_size   256k;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $remote_addr;
+        proxy_set_header Host $http_host;
+
+        proxy_pass http://<%= it.hostMachine %>:<% if (it.config.configuration.varnish.enabled) { %><%= it.ports.varnish %><% } else { %><%= it.ports.app %><% } %>;
+    }
+}

package/lib/config/versions/magento-2.3.0.js

@@ -1,5 +1,6 @@
 const path = require('path');
 const { defaultMagentoConfig } = require('../magento-config');
+const { sslTerminator } = require('../ssl-terminator');
 const { varnish66 } = require('../varnish/varnish-6-6');
 
 module.exports = ({ templateDir } = {}) => ({
@@ -45,7 +46,8 @@ module.exports = ({ templateDir } = {}) => ({
         composer: {
             version: '1'
         },
-        varnish: varnish66({ templateDir })
+        varnish: varnish66({ templateDir }),
+        sslTerminator: sslTerminator({ templateDir })
     },
     magento: defaultMagentoConfig,
     host: 'localhost',

package/lib/config/versions/magento-2.3.1.js

@@ -1,5 +1,6 @@
 const path = require('path');
 const { defaultMagentoConfig } = require('../magento-config');
+const { sslTerminator } = require('../ssl-terminator');
 const { varnish66 } = require('../varnish/varnish-6-6');
 
 module.exports = ({ templateDir } = {}) => ({
@@ -45,7 +46,8 @@ module.exports = ({ templateDir } = {}) => ({
         composer: {
             version: '1'
         },
-        varnish: varnish66({ templateDir })
+        varnish: varnish66({ templateDir }),
+        sslTerminator: sslTerminator({ templateDir })
     },
     magento: defaultMagentoConfig,
     host: 'localhost',

package/lib/config/versions/magento-2.3.2-p2.js

@@ -1,5 +1,6 @@
 const path = require('path');
 const { defaultMagentoConfig } = require('../magento-config');
+const { sslTerminator } = require('../ssl-terminator');
 const { varnish66 } = require('../varnish/varnish-6-6');
 
 module.exports = ({ templateDir } = {}) => ({
@@ -45,7 +46,8 @@ module.exports = ({ templateDir } = {}) => ({
         composer: {
             version: '1'
         },
-        varnish: varnish66({ templateDir })
+        varnish: varnish66({ templateDir }),
+        sslTerminator: sslTerminator({ templateDir })
     },
     magento: defaultMagentoConfig,
     host: 'localhost',

package/lib/config/versions/magento-2.3.2.js

@@ -1,5 +1,6 @@
 const path = require('path');
 const { defaultMagentoConfig } = require('../magento-config');
+const { sslTerminator } = require('../ssl-terminator');
 const { varnish66 } = require('../varnish/varnish-6-6');
 
 module.exports = ({ templateDir } = {}) => ({
@@ -45,7 +46,8 @@ module.exports = ({ templateDir } = {}) => ({
         composer: {
             version: '1'
         },
-        varnish: varnish66({ templateDir })
+        varnish: varnish66({ templateDir }),
+        sslTerminator: sslTerminator({ templateDir })
     },
     magento: defaultMagentoConfig,
     host: 'localhost',

package/lib/config/versions/magento-2.3.3-p1.js

@@ -1,5 +1,6 @@
 const path = require('path');
 const { defaultMagentoConfig } = require('../magento-config');
+const { sslTerminator } = require('../ssl-terminator');
 const { varnish66 } = require('../varnish/varnish-6-6');
 
 module.exports = ({ templateDir } = {}) => ({
@@ -45,7 +46,8 @@ module.exports = ({ templateDir } = {}) => ({
         composer: {
             version: '1'
         },
-        varnish: varnish66({ templateDir })
+        varnish: varnish66({ templateDir }),
+        sslTerminator: sslTerminator({ templateDir })
     },
     magento: defaultMagentoConfig,
     host: 'localhost',

package/lib/config/versions/magento-2.3.3.js

@@ -1,5 +1,6 @@
 const path = require('path');
 const { defaultMagentoConfig } = require('../magento-config');
+const { sslTerminator } = require('../ssl-terminator');
 const { varnish66 } = require('../varnish/varnish-6-6');
 
 module.exports = ({ templateDir } = {}) => ({
@@ -45,7 +46,8 @@ module.exports = ({ templateDir } = {}) => ({
         composer: {
             version: '1'
         },
-        varnish: varnish66({ templateDir })
+        varnish: varnish66({ templateDir }),
+        sslTerminator: sslTerminator({ templateDir })
     },
     magento: defaultMagentoConfig,
     host: 'localhost',

package/lib/config/versions/magento-2.3.4-p2.js

@@ -1,5 +1,6 @@
 const path = require('path');
 const { defaultMagentoConfig } = require('../magento-config');
+const { sslTerminator } = require('../ssl-terminator');
 const { varnish66 } = require('../varnish/varnish-6-6');
 
 module.exports = ({ templateDir } = {}) => ({
@@ -45,7 +46,8 @@ module.exports = ({ templateDir } = {}) => ({
         composer: {
             version: '1'
         },
-        varnish: varnish66({ templateDir })
+        varnish: varnish66({ templateDir }),
+        sslTerminator: sslTerminator({ templateDir })
     },
     magento: defaultMagentoConfig,
     host: 'localhost',

package/lib/config/versions/magento-2.3.4.js

@@ -1,5 +1,6 @@
 const path = require('path');
 const { defaultMagentoConfig } = require('../magento-config');
+const { sslTerminator } = require('../ssl-terminator');
 const { varnish66 } = require('../varnish/varnish-6-6');
 
 module.exports = ({ templateDir } = {}) => ({
@@ -45,7 +46,8 @@ module.exports = ({ templateDir } = {}) => ({
         composer: {
             version: '1'
         },
-        varnish: varnish66({ templateDir })
+        varnish: varnish66({ templateDir }),
+        sslTerminator: sslTerminator({ templateDir })
     },
     magento: defaultMagentoConfig,
     host: 'localhost',

package/lib/config/versions/magento-2.3.5-p1.js

@@ -1,5 +1,6 @@
 const path = require('path');
 const { defaultMagentoConfig } = require('../magento-config');
+const { sslTerminator } = require('../ssl-terminator');
 const { varnish66 } = require('../varnish/varnish-6-6');
 
 module.exports = ({ templateDir } = {}) => ({
@@ -45,7 +46,8 @@ module.exports = ({ templateDir } = {}) => ({
         composer: {
             version: '1'
         },
-        varnish: varnish66({ templateDir })
+        varnish: varnish66({ templateDir }),
+        sslTerminator: sslTerminator({ templateDir })
     },
     magento: defaultMagentoConfig,
     host: 'localhost',

package/lib/config/versions/magento-2.3.5-p2.js

@@ -1,5 +1,6 @@
 const path = require('path');
 const { defaultMagentoConfig } = require('../magento-config');
+const { sslTerminator } = require('../ssl-terminator');
 const { varnish66 } = require('../varnish/varnish-6-6');
 
 module.exports = ({ templateDir } = {}) => ({
@@ -45,7 +46,8 @@ module.exports = ({ templateDir } = {}) => ({
         composer: {
             version: '1'
         },
-        varnish: varnish66({ templateDir })
+        varnish: varnish66({ templateDir }),
+        sslTerminator: sslTerminator({ templateDir })
     },
     magento: defaultMagentoConfig,
     host: 'localhost',

package/lib/config/versions/magento-2.3.5.js

@@ -1,5 +1,6 @@
 const path = require('path');
 const { defaultMagentoConfig } = require('../magento-config');
+const { sslTerminator } = require('../ssl-terminator');
 const { varnish66 } = require('../varnish/varnish-6-6');
 
 module.exports = ({ templateDir } = {}) => ({
@@ -45,7 +46,8 @@ module.exports = ({ templateDir } = {}) => ({
         composer: {
             version: '1'
         },
-        varnish: varnish66({ templateDir })
+        varnish: varnish66({ templateDir }),
+        sslTerminator: sslTerminator({ templateDir })
     },
     magento: defaultMagentoConfig,
     host: 'localhost',

package/lib/config/versions/magento-2.3.6-p1.js

@@ -1,5 +1,6 @@
 const path = require('path');
 const { defaultMagentoConfig } = require('../magento-config');
+const { sslTerminator } = require('../ssl-terminator');
 const { varnish66 } = require('../varnish/varnish-6-6');
 
 module.exports = ({ templateDir } = {}) => ({
@@ -45,7 +46,8 @@ module.exports = ({ templateDir } = {}) => ({
         composer: {
             version: '1'
         },
-        varnish: varnish66({ templateDir })
+        varnish: varnish66({ templateDir }),
+        sslTerminator: sslTerminator({ templateDir })
     },
     magento: defaultMagentoConfig,
     host: 'localhost',

package/lib/config/versions/magento-2.3.6.js

@@ -1,5 +1,6 @@
 const path = require('path');
 const { defaultMagentoConfig } = require('../magento-config');
+const { sslTerminator } = require('../ssl-terminator');
 const { varnish66 } = require('../varnish/varnish-6-6');
 
 module.exports = ({ templateDir } = {}) => ({
@@ -45,7 +46,8 @@ module.exports = ({ templateDir } = {}) => ({
         composer: {
             version: '1'
         },
-        varnish: varnish66({ templateDir })
+        varnish: varnish66({ templateDir }),
+        sslTerminator: sslTerminator({ templateDir })
     },
     magento: defaultMagentoConfig,
     host: 'localhost',

package/lib/config/versions/magento-2.3.7-p1.js

@@ -1,5 +1,6 @@
 const path = require('path');
 const { defaultMagentoConfig } = require('../magento-config');
+const { sslTerminator } = require('../ssl-terminator');
 const { varnish66 } = require('../varnish/varnish-6-6');
 
 module.exports = ({ templateDir } = {}) => ({
@@ -43,7 +44,8 @@ module.exports = ({ templateDir } = {}) => ({
         composer: {
             version: '2'
         },
-        varnish: varnish66({ templateDir })
+        varnish: varnish66({ templateDir }),
+        sslTerminator: sslTerminator({ templateDir })
     },
     magento: defaultMagentoConfig,
     host: 'localhost',

package/lib/config/versions/magento-2.3.7-p2.js

@@ -1,5 +1,6 @@
 const path = require('path');
 const { defaultMagentoConfig } = require('../magento-config');
+const { sslTerminator } = require('../ssl-terminator');
 const { varnish66 } = require('../varnish/varnish-6-6');
 
 module.exports = ({ templateDir } = {}) => ({
@@ -43,7 +44,8 @@ module.exports = ({ templateDir } = {}) => ({
         composer: {
             version: '2'
         },
-        varnish: varnish66({ templateDir })
+        varnish: varnish66({ templateDir }),
+        sslTerminator: sslTerminator({ templateDir })
     },
     magento: defaultMagentoConfig,
     host: 'localhost',

package/lib/config/versions/magento-2.3.7-p3.js

@@ -1,5 +1,6 @@
 const path = require('path');
 const { defaultMagentoConfig } = require('../magento-config');
+const { sslTerminator } = require('../ssl-terminator');
 const { varnish66 } = require('../varnish/varnish-6-6');
 
 module.exports = ({ templateDir } = {}) => ({
@@ -43,7 +44,8 @@ module.exports = ({ templateDir } = {}) => ({
         composer: {
             version: '2'
         },
-        varnish: varnish66({ templateDir })
+        varnish: varnish66({ templateDir }),
+        sslTerminator: sslTerminator({ templateDir })
     },
     magento: defaultMagentoConfig,
     host: 'localhost',

package/lib/config/versions/magento-2.3.7.js

@@ -1,5 +1,6 @@
 const path = require('path');
 const { defaultMagentoConfig } = require('../magento-config');
+const { sslTerminator } = require('../ssl-terminator');
 const { varnish66 } = require('../varnish/varnish-6-6');
 
 module.exports = ({ templateDir } = {}) => ({
@@ -43,7 +44,8 @@ module.exports = ({ templateDir } = {}) => ({
         composer: {
             version: '2'
         },
-        varnish: varnish66({ templateDir })
+        varnish: varnish66({ templateDir }),
+        sslTerminator: sslTerminator({ templateDir })
     },
     magento: defaultMagentoConfig,
     host: 'localhost',

package/lib/config/versions/magento-2.4.0-p1.js

@@ -1,5 +1,6 @@
 const path = require('path');
 const { defaultMagentoConfig } = require('../magento-config');
+const { sslTerminator } = require('../ssl-terminator');
 const { varnish60 } = require('../varnish/varnish-6-0');
 
 module.exports = ({ templateDir } = {}) => ({
@@ -43,7 +44,8 @@ module.exports = ({ templateDir } = {}) => ({
         composer: {
             version: '1'
         },
-        varnish: varnish60({ templateDir })
+        varnish: varnish60({ templateDir }),
+        sslTerminator: sslTerminator({ templateDir })
     },
     magento: defaultMagentoConfig,
     host: 'localhost',

package/lib/config/versions/magento-2.4.0.js

@@ -1,5 +1,6 @@
 const path = require('path');
 const { defaultMagentoConfig } = require('../magento-config');
+const { sslTerminator } = require('../ssl-terminator');
 const { varnish60 } = require('../varnish/varnish-6-0');
 
 module.exports = ({ templateDir } = {}) => ({
@@ -43,7 +44,8 @@ module.exports = ({ templateDir } = {}) => ({
         composer: {
             version: '1'
         },
-        varnish: varnish60({ templateDir })
+        varnish: varnish60({ templateDir }),
+        sslTerminator: sslTerminator({ templateDir })
     },
     magento: defaultMagentoConfig,
     host: 'localhost',

package/lib/config/versions/magento-2.4.1-p1.js

@@ -1,6 +1,7 @@
 const path = require('path');
 const { defaultMagentoConfig } = require('../magento-config');
 const { libsodium } = require('../php/extensions');
+const { sslTerminator } = require('../ssl-terminator');
 const { varnish66 } = require('../varnish/varnish-6-6');
 
 module.exports = ({ templateDir } = {}) => ({
@@ -45,7 +46,8 @@ module.exports = ({ templateDir } = {}) => ({
         composer: {
             version: '1'
         },
-        varnish: varnish66({ templateDir })
+        varnish: varnish66({ templateDir }),
+        sslTerminator: sslTerminator({ templateDir })
     },
     magento: defaultMagentoConfig,
     host: 'localhost',

package/lib/config/versions/magento-2.4.1.js

@@ -1,5 +1,6 @@
 const path = require('path');
 const { defaultMagentoConfig } = require('../magento-config');
+const { sslTerminator } = require('../ssl-terminator');
 const { varnish66 } = require('../varnish/varnish-6-6');
 
 module.exports = ({ templateDir } = {}) => ({
@@ -43,7 +44,8 @@ module.exports = ({ templateDir } = {}) => ({
         composer: {
             version: '1'
         },
-        varnish: varnish66({ templateDir })
+        varnish: varnish66({ templateDir }),
+        sslTerminator: sslTerminator({ templateDir })
     },
     magento: defaultMagentoConfig,
     host: 'localhost',

package/lib/config/versions/magento-2.4.2-p1.js

@@ -1,6 +1,7 @@
 const path = require('path');
 const { defaultMagentoConfig } = require('../magento-config');
 const { libsodium } = require('../php/extensions');
+const { sslTerminator } = require('../ssl-terminator');
 const { varnish66 } = require('../varnish/varnish-6-6');
 
 module.exports = ({ templateDir } = {}) => ({
@@ -47,7 +48,8 @@ module.exports = ({ templateDir } = {}) => ({
         composer: {
             version: '2'
         },
-        varnish: varnish66({ templateDir })
+        varnish: varnish66({ templateDir }),
+        sslTerminator: sslTerminator({ templateDir })
     },
     magento: defaultMagentoConfig,
     host: 'localhost',

package/lib/config/versions/magento-2.4.2-p2.js

@@ -1,6 +1,7 @@
 const path = require('path');
 const { defaultMagentoConfig } = require('../magento-config');
 const { libsodium } = require('../php/extensions');
+const { sslTerminator } = require('../ssl-terminator');
 const { varnish66 } = require('../varnish/varnish-6-6');
 
 module.exports = ({ templateDir } = {}) => ({
@@ -47,7 +48,8 @@ module.exports = ({ templateDir } = {}) => ({
         composer: {
             version: '2'
         },
-        varnish: varnish66({ templateDir })
+        varnish: varnish66({ templateDir }),
+        sslTerminator: sslTerminator({ templateDir })
     },
     magento: defaultMagentoConfig,
     host: 'localhost',

package/lib/config/versions/magento-2.4.2.js

@@ -1,6 +1,7 @@
 const path = require('path');
 const { defaultMagentoConfig } = require('../magento-config');
 const { libsodium } = require('../php/extensions');
+const { sslTerminator } = require('../ssl-terminator');
 const { varnish66 } = require('../varnish/varnish-6-6');
 
 module.exports = ({ templateDir } = {}) => ({
@@ -46,7 +47,8 @@ module.exports = ({ templateDir } = {}) => ({
         composer: {
             version: '2'
         },
-        varnish: varnish66({ templateDir })
+        varnish: varnish66({ templateDir }),
+        sslTerminator: sslTerminator({ templateDir })
     },
     magento: defaultMagentoConfig,
     host: 'localhost',

package/lib/config/versions/magento-2.4.3-p1.js

@@ -1,6 +1,7 @@
 const path = require('path');
 const { defaultMagentoConfig } = require('../magento-config');
 const { libsodium } = require('../php/extensions');
+const { sslTerminator } = require('../ssl-terminator');
 const { varnish66 } = require('../varnish/varnish-6-6');
 
 module.exports = ({ templateDir } = {}) => ({
@@ -47,7 +48,8 @@ module.exports = ({ templateDir } = {}) => ({
         composer: {
             version: '2'
         },
-        varnish: varnish66({ templateDir })
+        varnish: varnish66({ templateDir }),
+        sslTerminator: sslTerminator({ templateDir })
     },
     magento: defaultMagentoConfig,
     host: 'localhost',

package/lib/config/versions/magento-2.4.3-p2.js

@@ -1,6 +1,7 @@
 const path = require('path');
 const { defaultMagentoConfig } = require('../magento-config');
 const { libsodium } = require('../php/extensions');
+const { sslTerminator } = require('../ssl-terminator');
 const { varnish66 } = require('../varnish/varnish-6-6');
 
 module.exports = ({ templateDir } = {}) => ({
@@ -47,7 +48,8 @@ module.exports = ({ templateDir } = {}) => ({
         composer: {
             version: '2'
         },
-        varnish: varnish66({ templateDir })
+        varnish: varnish66({ templateDir }),
+        sslTerminator: sslTerminator({ templateDir })
     },
     magento: defaultMagentoConfig,
     host: 'localhost',

package/lib/config/versions/magento-2.4.3.js

@@ -1,6 +1,7 @@
 const path = require('path');
 const { defaultMagentoConfig } = require('../magento-config');
 const { libsodium } = require('../php/extensions');
+const { sslTerminator } = require('../ssl-terminator');
 const { varnish66 } = require('../varnish/varnish-6-6');
 
 module.exports = ({ templateDir } = {}) => ({
@@ -47,7 +48,8 @@ module.exports = ({ templateDir } = {}) => ({
         composer: {
             version: '2'
         },
-        varnish: varnish66({ templateDir })
+        varnish: varnish66({ templateDir }),
+        sslTerminator: sslTerminator({ templateDir })
     },
     magento: defaultMagentoConfig,
     host: 'localhost',

package/lib/config/versions/magento-2.4.4.js

@@ -1,6 +1,7 @@
 const path = require('path');
 const { defaultMagentoConfig } = require('../magento-config');
 const { libsodium } = require('../php/extensions');
+const { sslTerminator } = require('../ssl-terminator');
 const { varnish70 } = require('../varnish/varnish-7-0');
 
 module.exports = ({ templateDir } = {}) => ({
@@ -47,7 +48,8 @@ module.exports = ({ templateDir } = {}) => ({
         composer: {
             version: '2'
         },
-        varnish: varnish70({ templateDir })
+        varnish: varnish70({ templateDir }),
+        sslTerminator: sslTerminator({ templateDir })
     },
     magento: defaultMagentoConfig,
     host: 'localhost',

package/lib/tasks/file-system/create-nginx-config.js

@@ -1,9 +1,6 @@
 const os = require('os');
 const path = require('path');
-const fs = require('fs');
 const setConfigFile = require('../../util/set-config');
-const pathExists = require('../../util/path-exists');
-const { isIpAddress } = require('../../util/ip');
 
 /**
  * @type {() => import('listr2').ListrTask<import('../../../typings/context').ListrContext>}
@@ -23,45 +20,9 @@ const createNginxConfig = () => ({
         const {
             configuration: {
                 nginx
-            },
-            ssl,
-            host
-        } = overridenConfiguration;
-
-        if (ssl.enabled) {
-            if (!(await pathExists(ssl.ssl_certificate))) {
-                throw new Error('ssl.ssl_certificate file does not exist!');
-            }
-            if (!(await pathExists(ssl.ssl_certificate_key))) {
-                throw new Error('ssl.ssl_certificate_key file does not exist!');
             }
+        } = overridenConfiguration;
 
-            const nginxCacheDir = path.join(baseConfig.cacheDir, 'nginx', 'conf.d');
-            if (!await pathExists(nginxCacheDir)) {
-                await fs.promises.mkdir(nginxCacheDir, { recursive: true });
-            }
-
-            await fs.promises.copyFile(
-                ssl.ssl_certificate,
-                path.join(
-                    baseConfig.cacheDir,
-                    'nginx',
-                    'conf.d',
-                    'ssl_certificate.pem'
-                )
-            );
-            await fs.promises.copyFile(
-                ssl.ssl_certificate_key,
-                path.join(
-                    baseConfig.cacheDir,
-                    'nginx',
-                    'conf.d',
-                    'ssl_certificate-key.pem'
-                )
-            );
-        }
-
-        const networkToBindTo = isIpAddress(host) ? host : '127.0.0.1';
         const isLinux = os.platform() === 'linux';
         const isNativeLinux = isLinux && !isWsl;
         const hostMachine = isNativeLinux ? '127.0.0.1' : 'host.docker.internal';
@@ -82,8 +43,7 @@ const createNginxConfig = () => ({
                     mageRoot: baseConfig.magentoDir,
                     hostMachine,
                     hostPort,
-                    config: overridenConfiguration,
-                    networkToBindTo
+                    config: overridenConfiguration
                 }
             });
         } catch (e) {

package/lib/tasks/file-system/create-ssl-terminator-config.js

@@ -0,0 +1,94 @@
+const os = require('os');
+const path = require('path');
+const fs = require('fs');
+const setConfigFile = require('../../util/set-config');
+const pathExists = require('../../util/path-exists');
+const { isIpAddress } = require('../../util/ip');
+
+/**
+ * @type {() => import('listr2').ListrTask<import('../../../typings/context').ListrContext>}
+ */
+const createSSLTerminatorConfig = () => ({
+    title: 'Setting ssl terminator config',
+    task: async (ctx) => {
+        const {
+            ports,
+            config: {
+                overridenConfiguration,
+                baseConfig
+            },
+            isWsl
+        } = ctx;
+
+        const {
+            configuration: {
+                sslTerminator
+            },
+            ssl,
+            host
+        } = overridenConfiguration;
+
+        if (ssl.enabled) {
+            if (!(await pathExists(ssl.ssl_certificate))) {
+                throw new Error('ssl.ssl_certificate file does not exist!');
+            }
+            if (!(await pathExists(ssl.ssl_certificate_key))) {
+                throw new Error('ssl.ssl_certificate_key file does not exist!');
+            }
+
+            const nginxCacheDir = path.join(baseConfig.cacheDir, 'nginx', 'conf.d');
+            if (!await pathExists(nginxCacheDir)) {
+                await fs.promises.mkdir(nginxCacheDir, { recursive: true });
+            }
+
+            await fs.promises.copyFile(
+                ssl.ssl_certificate,
+                path.join(
+                    baseConfig.cacheDir,
+                    'ssl-terminator',
+                    'conf.d',
+                    'ssl_certificate.pem'
+                )
+            );
+            await fs.promises.copyFile(
+                ssl.ssl_certificate_key,
+                path.join(
+                    baseConfig.cacheDir,
+                    'ssl-terminator',
+                    'conf.d',
+                    'ssl_certificate-key.pem'
+                )
+            );
+        }
+
+        const networkToBindTo = isIpAddress(host) ? host : '127.0.0.1';
+        const isLinux = os.platform() === 'linux';
+        const isNativeLinux = isLinux && !isWsl;
+        const hostMachine = isNativeLinux ? '127.0.0.1' : 'host.docker.internal';
+        const hostPort = isNativeLinux ? ports.sslTerminator : 80;
+
+        try {
+            await setConfigFile({
+                configPathname: path.join(
+                    baseConfig.cacheDir,
+                    'ssl-terminator',
+                    'conf.d',
+                    'default.conf'
+                ),
+                template: sslTerminator.configTemplate,
+                overwrite: true,
+                templateArgs: {
+                    ports,
+                    hostMachine,
+                    hostPort,
+                    config: overridenConfiguration,
+                    networkToBindTo
+                }
+            });
+        } catch (e) {
+            throw new Error(`Unexpected error accrued during ssl terminator config creation\n\n${e}`);
+        }
+    }
+});
+
+module.exports = createSSLTerminatorConfig;

package/lib/tasks/file-system/create-varnish-config.js

@@ -46,6 +46,28 @@ const createVarnishConfig = () => ({
         } catch (e) {
             throw new Error(`Unexpected error accrued during varnish config creation\n\n${e}`);
         }
+
+        // try {
+        //     await setConfigFile({
+        //         configPathname: path.join(
+        //             cacheDir,
+        //             'nginx-cache-router',
+        //             'conf.d',
+        //             'default.conf'
+        //         ),
+        //         template: path.join(templateDir, 'nginx-cache-router.template.conf'),
+        //         overwrite: true,
+        //         templateArgs: {
+        //             ports,
+        //             hostMachine,
+        //             hostPort,
+        //             config: overridenConfiguration,
+        //             networkToBindTo
+        //         }
+        //     });
+        // } catch (e) {
+        //     throw new Error(`Unexpected error accrued during nginx-cache-router config creation\n\n${e}`);
+        // }
     }
 });
 

package/lib/tasks/file-system/index.js

@@ -2,6 +2,7 @@ const createNginxConfig = require('./create-nginx-config');
 const createPhpConfig = require('./create-php-config');
 const createPhpFpmConfig = require('./create-php-fpm-config');
 const createPhpStormConfig = require('./create-php-storm-config');
+const createSSLTerminatorConfig = require('./create-ssl-terminator-config');
 const createVarnishConfig = require('./create-varnish-config');
 const createVSCodeConfig = require('./create-vscode-config');
 
@@ -11,6 +12,7 @@ const createVSCodeConfig = require('./create-vscode-config');
 const prepareFileSystem = () => ({
     title: 'Preparing file system',
     task: (ctx, task) => task.newListr([
+        createSSLTerminatorConfig(),
         createNginxConfig(),
         createPhpFpmConfig(),
         createPhpConfig(),

package/lib/tasks/status/index.js

@@ -6,6 +6,7 @@ const { version: packageVersion } = require('../../../package.json');
 const { getArchSync } = require('../../util/arch');
 const ConsoleBlock = require('../../util/console-block');
 const { getComposerVersion } = require('../composer');
+const { getInstanceMetadata } = require('../../util/instance-metadata');
 
 /**
  * @param {string} port
@@ -23,11 +24,8 @@ const parsePort = (port) => {
 
 const prettyStatus = async (ctx) => {
     const {
-        ports,
         config: {
-            magentoConfiguration,
             baseConfig,
-            overridenConfiguration: { host, ssl },
             php,
             composer
         },
@@ -107,15 +105,33 @@ const prettyStatus = async (ctx) => {
         }
     });
 
+    const instanceMetadata = getInstanceMetadata(ctx);
+
     block
         .addEmptyLine()
-        .addSeparator('Magento status')
-        .addEmptyLine()
-        .addLine(`Web location: ${logger.style.link(`${ssl.enabled ? 'https' : 'http'}://${host}${ports.app === 80 ? '' : `:${ports.app}`}/`)}`)
-        .addLine(`Magento Admin panel location: ${logger.style.link(`${ssl.enabled ? 'https' : 'http'}://${host}${ports.app === 80 ? '' : `:${ports.app}`}/${magentoConfiguration.adminuri}`)}`)
-        .addLine(`Magento Admin panel credentials: ${logger.style.misc(magentoConfiguration.user)} - ${logger.style.misc(magentoConfiguration.password)}`)
+        .addSeparator('Magento 2')
         .addEmptyLine();
 
+    block.addLine(logger.style.misc('Frontend'));
+    instanceMetadata.frontend.forEach(({ title, text }) => {
+        block.addLine(`  ${title}: ${text}`);
+    });
+
+    block.addEmptyLine();
+
+    block.addLine(logger.style.misc('Admin'));
+    instanceMetadata.admin.forEach(({ title, text }) => {
+        block.addLine(`  ${title}: ${text}`);
+    });
+    // block
+    //     .addEmptyLine()
+    //     .addSeparator('Magento status')
+    //     .addEmptyLine()
+    //     .addLine(`Web location: ${logger.style.link(`${ssl.enabled ? 'https' : 'http'}://${host}${ports.app === 80 ? '' : `:${ports.app}`}/`)}`)
+    //     .addLine(`Magento Admin panel location: ${logger.style.link(`${ssl.enabled ? 'https' : 'http'}://${host}${ports.app === 80 ? '' : `:${ports.app}`}/${magentoConfiguration.adminuri}`)}`)
+    //     .addLine(`Magento Admin panel credentials: ${logger.style.misc(magentoConfiguration.user)} - ${logger.style.misc(magentoConfiguration.password)}`)
+    //     .addEmptyLine();
+
     block.log();
 };
 

package/lib/util/config-file-validator.js

@@ -111,7 +111,8 @@ const configurationSchema = Joi.object({
     elasticsearch: serviceConfigurationSchema.optional(),
     redis: serviceConfigurationSchema.optional(),
     composer: composerConfigurationSchema.optional(),
-    varnish: varnishConfigurationSchema.optional()
+    varnish: varnishConfigurationSchema.optional(),
+    sslTerminator: nginxConfigurationSchema.optional()
 });
 
 /**

package/lib/util/instance-metadata.js

@@ -38,7 +38,7 @@ const getInstanceMetadata = (ctx) => {
     if (isNgrok) {
         frontend.push({
             title: WEB_LOCAL_LOCATION_TITLE,
-            text: `${ssl.enabled ? 'https' : 'http'}://localhost${ssl.enabled || ports.app === 80 ? '' : `:${ports.app}`}/`
+            text: `${ssl.enabled ? 'https' : 'http'}://localhost${ssl.enabled || ports.sslTerminator === 80 ? '' : `:${ports.sslTerminator}`}/`
         });
         frontend.push({
             title: WEB_LOCATION_TITLE,
@@ -47,7 +47,7 @@ const getInstanceMetadata = (ctx) => {
     } else {
         frontend.push({
             title: WEB_LOCATION_TITLE,
-            text: `${ssl.enabled ? 'https' : 'http'}://${host}${ssl.enabled || ports.app === 80 ? '' : `:${ports.app}`}/`
+            text: `${ssl.enabled ? 'https' : 'http'}://${host}${ssl.enabled || ports.sslTerminator === 80 ? '' : `:${ports.sslTerminator}`}/`
         });
     }
 

package/package.json

@@ -3,7 +3,7 @@
     "description": "Scripts and configuration used by CMA.",
     "homepage": "https://docs.create-magento-app.com/",
     "repository": "github:scandipwa/create-magento-app",
-    "version": "1.14.1-alpha.8",
+    "version": "1.14.1-alpha.9",
     "main": "./index.js",
     "types": "./typings/index.d.ts",
     "license": "OSL-3.0",
@@ -51,5 +51,5 @@
         "mysql",
         "scandipwa"
     ],
-    "gitHead": "a59a530f5ebb1946f3138b57fb1674fe7df305c9"
+    "gitHead": "cf3f08226674ad5c6b6b03db93785dd9acf48025"
 }

package/typings/index.d.ts

@@ -10,7 +10,14 @@ export interface ServiceWithVersion {
     version: string
 }
 
-// export inter/
+export interface SSLTerminatorConfiguration extends ServiceWithVersion {
+    /**
+     * Configuration file location
+     *
+     * @example ./my-ssl-terminator-config.conf
+     */
+    configTemplate: string
+}
 
 export interface NginxConfiguration extends ServiceWithVersion {
     /**
@@ -194,6 +201,11 @@ export interface CMAConfiguration {
          * Varnish configuration
          */
         varnish: VarnishConfiguration
+
+        /**
+         * SSL Terminator configuration
+         */
+        sslTerminator: SSLTerminatorConfiguration
     }
     /**
      * Magento configuration