@scandipwa/magento-scripts 2.0.0-alpha.0 → 2.0.0-alpha.11

package/lib/config/templates/mariadb.template.cnf

@@ -0,0 +1,191 @@
+# MariaDB database server configuration file.
+#
+# You can copy this file to one of:
+# - "/etc/mysql/my.cnf" to set global options,
+# - "~/.my.cnf" to set user-specific options.
+#
+# One can use all long options that the program supports.
+# Run program with --help to get a list of available options and with
+# --print-defaults to see which it would actually understand and use.
+#
+# For explanations see
+# http://dev.mysql.com/doc/mysql/en/server-system-variables.html
+
+# This will be passed to all mysql clients
+# It has been reported that passwords should be enclosed with ticks/quotes
+# escpecially if they contain "#" chars...
+# Remember to edit /etc/mysql/debian.cnf when changing the socket location.
+[client]
+port            = 3306
+socket          = /var/run/mysqld/mysqld.sock
+
+# Here is entries for some specific programs
+# The following values assume you have at least 32M ram
+
+# This was formally known as [safe_mysqld]. Both versions are currently parsed.
+[mysqld_safe]
+socket          = /var/run/mysqld/mysqld.sock
+nice            = 0
+
+[mysqld]
+#
+# * Basic Settings
+#
+#user           = mysql
+pid-file        = /var/run/mysqld/mysqld.pid
+socket          = /var/run/mysqld/mysqld.sock
+port            = 3306
+basedir         = /usr
+datadir         = /var/lib/mysql
+tmpdir          = /tmp
+lc_messages_dir = /usr/share/mysql
+lc_messages     = en_US
+skip-external-locking
+#q
+# Instead of skip-networking the default is now to listen only on
+# localhost which is more compatible and is not less secure.
+# bind-address           = 0.0.0.0
+#
+# * Fine Tuning
+#
+max_connections         = 100
+connect_timeout         = 200
+wait_timeout            = 28800
+max_allowed_packet      = 1GB
+thread_cache_size       = 128
+sort_buffer_size        = 4M
+bulk_insert_buffer_size = 16M
+tmp_table_size          = 32M
+max_heap_table_size     = 32M
+#
+# * MyISAM
+#
+# This replaces the startup script and checks MyISAM tables if needed
+# the first time they are touched. On error, make copy and try a repair.
+myisam_recover_options = BACKUP
+key_buffer_size         = 128M
+#open-files-limit       = 2000
+table_open_cache        = 400
+myisam_sort_buffer_size = 512M
+concurrent_insert       = 2
+read_buffer_size        = 2M
+read_rnd_buffer_size    = 1M
+#
+# * Query Cache Configuration
+#
+# Cache only tiny result sets, so we can fit more in the query cache.
+query_cache_limit               = 128K
+query_cache_size                = 64M
+# for more write intensive setups, set to DEMAND or OFF
+#query_cache_type               = DEMAND
+#
+# * Logging and Replication
+#
+# Both location gets rotated by the cronjob.
+# Be aware that this log type is a performance killer.
+# As of 5.1 you can enable the log at runtime!
+#general_log_file        = /var/log/mysql/mysql.log
+#general_log             = 1
+#
+# Error logging goes to syslog due to /etc/mysql/conf.d/mysqld_safe_syslog.cnf.
+#
+# we do want to know about network errors and such
+#log_warnings           = 2
+#
+# Enable the slow query log to see queries with especially long duration
+#slow_query_log[={0|1}]
+slow_query_log_file     = /var/log/mysql/mariadb-slow.log
+long_query_time = 10
+#log_slow_rate_limit    = 1000
+#log_slow_verbosity     = query_plan
+
+#log-queries-not-using-indexes
+#log_slow_admin_statements
+#
+# The following can be used as easy to replay backup logs or for replication.
+# note: if you are setting up a replication slave, see README.Debian about
+#       other settings you may need to change.
+#server-id              = 1
+#report_host            = master1
+#auto_increment_increment = 2
+#auto_increment_offset  = 1
+#log_bin                        = /var/log/mysql/mariadb-bin
+#log_bin_index          = /var/log/mysql/mariadb-bin.index
+# not fab for performance, but safer
+#sync_binlog            = 1
+expire_logs_days        = 10
+max_binlog_size         = 100M
+# slaves
+#relay_log              = /var/log/mysql/relay-bin
+#relay_log_index        = /var/log/mysql/relay-bin.index
+#relay_log_info_file    = /var/log/mysql/relay-bin.info
+#log_slave_updates
+#read_only
+#
+# If applications support it, this stricter sql_mode prevents some
+# mistakes like inserting invalid dates etc.
+#sql_mode               = NO_ENGINE_SUBSTITUTION,TRADITIONAL
+#
+# * InnoDB
+#
+# InnoDB is enabled by default with a 10MB datafile in /var/lib/mysql/.
+# Read the manual for more InnoDB related options. There are many!
+default_storage_engine  = InnoDB
+innodb_buffer_pool_size = 256M
+innodb_log_buffer_size  = 8M
+innodb_file_per_table   = 1
+innodb_open_files       = 400
+innodb_io_capacity      = 400
+innodb_flush_method     = O_DIRECT
+#
+# * Security Features
+#
+# Read the manual, too, if you want chroot!
+# chroot = /var/lib/mysql/
+#
+# For generating SSL certificates I recommend the OpenSSL GUI "tinyca".
+#
+# ssl-ca=/etc/mysql/cacert.pem
+# ssl-cert=/etc/mysql/server-cert.pem
+# ssl-key=/etc/mysql/server-key.pem
+
+#
+# * Galera-related settings
+#
+[galera]
+# Mandatory settings
+#wsrep_on=ON
+#wsrep_provider=
+#wsrep_cluster_address=
+#binlog_format=row
+#default_storage_engine=InnoDB
+#innodb_autoinc_lock_mode=2
+#
+# Allow server to accept connections on all interfaces.
+#
+#bind-address=0.0.0.0
+#
+# Optional setting
+#wsrep_slave_threads=1
+#innodb_flush_log_at_trx_commit=0
+
+[mysqldump]
+quick
+quote-names
+max_allowed_packet      = 16M
+
+[mysql]
+#no-auto-rehash # faster start of mysql but no tab completion
+
+[isamchk]
+key_buffer              = 16M
+
+#
+# * IMPORTANT: Additional settings that can override those from this file!
+#   The files must end with '.cnf', otherwise they'll be ignored.
+#
+[mariadb]
+skip-host-cache
+skip-name-resolve
+
+!includedir /etc/mysql/conf.d/

package/lib/config/templates/php-debug.template.ini

@@ -0,0 +1,31 @@
+[xdebug]
+error_reporting=E_ALL
+
+xdebug.idekey=PHPSTORM
+
+<% if (it.isXDebug2) { %>
+xdebug.remote_autostart=1
+xdebug.remote_enable=1
+
+xdebug.remote_host=<%~ it.hostMachine %>
+
+xdebug.remote_port=9003
+
+xdebug.remote_log=<%~ it.mageRoot %>/var/log/xdebug.log
+
+<% } else { %>
+
+xdebug.mode=debug
+xdebug.client_host=<%~ it.hostMachine %>
+
+xdebug.client_port=9003
+
+; THIS THING WILL BREAK PHP
+; xdebug.start_with_request=yes
+
+xdebug.discover_client_host=false
+xdebug.start_upon_error=yes
+
+xdebug.log=<%~ it.mageRoot %>/var/log/xdebug.log
+
+<% } %>

package/lib/config/templates/php-fpm.template.conf

@@ -3,6 +3,7 @@ daemonize = no
 log_level = debug
 
 [www]
+clear_env = no
 user = nobody
 ;; Commented because if it is not set, php-fpm will use default group.
 ;; https://www.php.net/manual/en/install.fpm.configuration.php#group
@@ -17,5 +18,3 @@ pm.max_requests = 5000
 pm.process_idle_timeout = 10s
 pm.status_path = /fpmstatus
 listen = <%~ it.port %>
-
-env[PATH] = $PATH

package/lib/config/templates/php.template.ini

@@ -1811,159 +1811,13 @@ ldap.max_links = -1
 ;dba.default_handler=
 
 [opcache]
-; Determines if Zend OPCache is enabled
 opcache.enable=1
-
-; Determines if Zend OPCache is enabled for the CLI version of PHP
-;opcache.enable_cli=0
-
-; The OPcache shared memory storage size.
-;opcache.memory_consumption=128
-
-; The amount of memory for interned strings in Mbytes.
-;opcache.interned_strings_buffer=8
-
-; The maximum number of keys (scripts) in the OPcache hash table.
-; Only numbers between 200 and 1000000 are allowed.
-;opcache.max_accelerated_files=10000
-
-; The maximum percentage of "wasted" memory until a restart is scheduled.
-;opcache.max_wasted_percentage=5
-
-; When this directive is enabled, the OPcache appends the current working
-; directory to the script key, thus eliminating possible collisions between
-; files with the same name (basename). Disabling the directive improves
-; performance, but may break existing applications.
-;opcache.use_cwd=1
-
-; When disabled, you must reset the OPcache manually or restart the
-; webserver for changes to the filesystem to take effect.
-opcache.validate_timestamps=1
-
-; How often (in seconds) to check file timestamps for changes to the shared
-; memory storage allocation. ("1" means validate once per second, but only
-; once per request. "0" means always validate)
-opcache.revalidate_freq=2
-
-; Enables or disables file search in include_path optimization
-;opcache.revalidate_path=0
-
-; If disabled, all PHPDoc comments are dropped from the code to reduce the
-; size of the optimized code.
-opcache.save_comments=1
-
-; If enabled, compilation warnings (including notices and deprecations) will
-; be recorded and replayed each time a file is included. Otherwise, compilation
-; warnings will only be emitted when the file is first cached.
-;opcache.record_warnings=0
-
-; Allow file existence override (file_exists, etc.) performance feature.
-;opcache.enable_file_override=0
-
-; A bitmask, where each bit enables or disables the appropriate OPcache
-; passes
-;opcache.optimization_level=0x7FFFBFFF
-
-;opcache.dups_fix=0
-
-; The location of the OPcache blacklist file (wildcards allowed).
-; Each OPcache blacklist file is a text file that holds the names of files
-; that should not be accelerated. The file format is to add each filename
-; to a new line. The filename may be a full path or just a file prefix
-; (i.e., /var/www/x  blacklists all the files and directories in /var/www
-; that start with 'x'). Line starting with a ; are ignored (comments).
-;opcache.blacklist_filename=
-
-; Allows exclusion of large files from being cached. By default all files
-; are cached.
-;opcache.max_file_size=0
-
-; Check the cache checksum each N requests.
-; The default value of "0" means that the checks are disabled.
-;opcache.consistency_checks=0
-
-; How long to wait (in seconds) for a scheduled restart to begin if the cache
-; is not being accessed.
-;opcache.force_restart_timeout=180
-
-; OPcache error_log file name. Empty string assumes "stderr".
-;opcache.error_log=
-
-; All OPcache errors go to the Web server log.
-; By default, only fatal errors (level 0) or errors (level 1) are logged.
-; You can also enable warnings (level 2), info messages (level 3) or
-; debug messages (level 4).
-;opcache.log_verbosity_level=1
-
-; Preferred Shared Memory back-end. Leave empty and let the system decide.
-;opcache.preferred_memory_model=
-
-; Protect the shared memory from unexpected writing during script execution.
-; Useful for internal debugging only.
-;opcache.protect_memory=0
-
-; Allows calling OPcache API functions only from PHP scripts which path is
-; started from specified string. The default "" means no restriction
-;opcache.restrict_api=
-
-; Mapping base of shared memory segments (for Windows only). All the PHP
-; processes have to map shared memory into the same address space. This
-; directive allows to manually fix the "Unable to reattach to base address"
-; errors.
-;opcache.mmap_base=
-
-; Facilitates multiple OPcache instances per user (for Windows only). All PHP
-; processes with the same cache ID and user share an OPcache instance.
-;opcache.cache_id=
-
-; Enables and sets the second level cache directory.
-; It should improve performance when SHM memory is full, at server restart or
-; SHM reset. The default "" disables file based caching.
-;opcache.file_cache=
-
-; Enables or disables opcode caching in shared memory.
-;opcache.file_cache_only=0
-
-; Enables or disables checksum validation when script loaded from file cache.
-;opcache.file_cache_consistency_checks=1
-
-; Implies opcache.file_cache_only=1 for a certain process that failed to
-; reattach to the shared memory (for Windows only). Explicitly enabled file
-; cache is required.
-;opcache.file_cache_fallback=1
-
-; Enables or disables copying of PHP code (text segment) into HUGE PAGES.
-; This should improve performance, but requires appropriate OS configuration.
-;opcache.huge_code_pages=1
-
-; Validate cached file permissions.
-;opcache.validate_permission=0
-
-; Prevent name collisions in chroot'ed environment.
-;opcache.validate_root=0
-
-; If specified, it produces opcode dumps for debugging different stages of
-; optimizations.
-;opcache.opt_debug_level=0
-
-; Specifies a PHP script that is going to be compiled and executed at server
-; start-up.
-; https://php.net/opcache.preload
-;opcache.preload=
-
-; Preloading code as root is not allowed for security reasons. This directive
-; facilitates to let the preloading to be run as another user.
-; https://php.net/opcache.preload_user
-;opcache.preload_user=
-
-; Prevents caching files that are less than this number of seconds old. It
-; protects from caching of incompletely updated files. In case all file updates
-; on your site are atomic, you may increase performance by setting it to "0".
-;opcache.file_update_protection=2
-
-; Absolute path used to store shared lockfiles (for *nix only).
-;opcache.lockfile_path=/tmp
-
+opcache.revalidate_freq=0
+opcache.validate_timestamps=0
+opcache.max_accelerated_files=100000
+opcache.memory_consumption=192
+opcache.max_wasted_percentage=10
+opcache.interned_strings_buffer=16
 [curl]
 ; A default value for the CURLOPT_CAINFO option. This is required to be an
 ; absolute path.
@@ -1996,53 +1850,3 @@ opcache.save_comments=1
 
 ; List of headers files to preload, wildcard patterns allowed.
 ;ffi.preload=
-
-[xdebug]
-<% if (it.debug) { %>
-error_reporting=E_ALL
-
-xdebug.idekey=PHPSTORM
-
-<% if (it.isXDebug2) { %>
-xdebug.remote_autostart=1
-xdebug.remote_enable=1
-
-xdebug.remote_host=<%~ it.hostMachine %>
-
-xdebug.remote_port=9003
-
-xdebug.remote_log=<%~ it.mageRoot %>/var/log/xdebug.log
-
-<% } else { %>
-
-xdebug.mode=debug
-xdebug.client_host=<%~ it.hostMachine %>
-
-xdebug.client_port=9003
-
-; THIS THING WILL BREAK PHP
-; xdebug.start_with_request=yes
-
-xdebug.discover_client_host=false
-xdebug.start_upon_error=yes
-
-xdebug.log=<%~ it.mageRoot %>/var/log/xdebug.log
-
-<% } %>
-
-<% } else { %>
-
-<% if (it.isXDebug2) { %>
-
-xdebug.remote_autostart=0
-xdebug.remote_enable=0
-
-<% } else { %>
-
-xdebug.mode=off
-
-<% } %>
-
-<% } %>
-
-apc.enabled=1

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

@@ -12,20 +12,25 @@ upstream app_backend {
 server {
     listen <%= it.hostPort %>;
 <% if (it.config.ssl.enabled) { %>  listen 443 ssl;
-    server_name <%= it.networkToBindTo %>;
 
+    ssl on;
     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 { %>_<% } %>;
+     <% if (it.config.host) { %>
+    server_name <%= it.config.host %><% if (it.config.ssl.enabled) { %> <%= it.networkToBindTo %><% } %>;
+    <% } else { %>
+    server_name <% if (it.config.ssl.enabled) { %> <%= it.networkToBindTo %><% } 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 X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Forwarded-Proto $scheme;
         proxy_set_header Host $http_host;
         proxy_http_version 1.1;
         proxy_set_header Connection "";
@@ -36,4 +41,6 @@ server {
 
         proxy_pass http://app_backend;
     }
+
+    client_max_body_size 64M;
 }

package/lib/config/templates/varnish.template.vcl

@@ -5,24 +5,31 @@ import std;
 # The minimal Varnish version is 6.0
 # For SSL offloading, pass the following header in your proxy server or load balancer: 'X-Forwarded-Proto: https'
 
+<% if (it.healthCheck) { %>
+probe healthcheck {
+    # .url = "/health_check.php";
+    .request =
+        "GET /health_check.php HTTP/1.1"
+        "Host: localhost"
+        "Connection: close"
+        "User-Agent: Varnish Health Probe";
+    .interval  = 10s;
+    .timeout   = 5s;
+    .window    = 8;
+    .threshold = 3;
+    .initial   = 3;
+}
+<% } %>
+
 backend default {
     .host = "<%= it.hostMachine %>";
     .host_header = "Host: localhost";
     .port = "<%= it.nginxPort %>";
     .first_byte_timeout = 600s;
-    .probe = {
-        # .url = "/health_check.php";
-        .request =
-            "GET /health_check.php HTTP/1.1"
-            "Host: localhost"
-            "Connection: close"
-            "User-Agent: Varnish Health Probe";
-        .interval  = 10s;
-        .timeout   = 5s;
-        .window    = 5;
-        .threshold = 3;
-   }
-}
+    .connect_timeout = 10s;
+    <% if (it.healthCheck) { %>
+.probe = healthcheck;
+    <% } %>}
 
 acl purge {
     "<%= it.hostMachine %>";

package/lib/config/varnish/varnish-6-0.js

@@ -1,7 +1,11 @@
 const path = require('path');
 
+/**
+ * @returns {import('../../../typings/index').VarnishConfiguration}
+ */
 const varnish60 = ({ templateDir }) => ({
     enabled: true,
+    healthCheck: false,
     version: '6.0',
     configTemplate: path.join(templateDir || '', 'varnish.template.vcl')
 });

package/lib/config/varnish/varnish-6-6.js

@@ -1,7 +1,11 @@
 const path = require('path');
 
+/**
+ * @returns {import('../../../typings/index').VarnishConfiguration}
+ */
 const varnish66 = ({ templateDir }) => ({
     enabled: true,
+    healthCheck: false,
     version: '6.6',
     configTemplate: path.join(templateDir || '', 'varnish.template.vcl')
 });

package/lib/config/varnish/varnish-7-0.js

@@ -1,7 +1,11 @@
 const path = require('path');
 
+/**
+ * @returns {import('../../../typings/index').VarnishConfiguration}
+ */
 const varnish70 = ({ templateDir }) => ({
     enabled: true,
+    healthCheck: false,
     version: '7.0',
     configTemplate: path.join(templateDir || '', 'varnish.template.vcl')
 });

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

@@ -1,9 +1,11 @@
-const path = require('path');
 const { defaultMagentoConfig } = require('../magento-config');
 const { magento23PHPExtensionList } = require('../magento/required-php-extensions');
 const { repo } = require('../php/base-repo');
 const { php72 } = require('../php/versions');
-const { sslTerminator } = require('../ssl-terminator');
+const { composer1 } = require('../services/composer/versions');
+const { elasticsearch68 } = require('../services/elasticsearch/versions');
+const { nginx118 } = require('../services/nginx/versions');
+const { sslTerminator } = require('../services/ssl-terminator');
 const { varnish66 } = require('../varnish/varnish-6-6');
 
 module.exports = ({ templateDir } = {}) => ({
@@ -14,10 +16,7 @@ module.exports = ({ templateDir } = {}) => ({
             extensions: magento23PHPExtensionList,
             baseImage: `${ repo }:php-7.2-magento-2.3`
         }),
-        nginx: {
-            version: '1.18.0',
-            configTemplate: path.join(templateDir || '', 'nginx.template.conf')
-        },
+        nginx: nginx118({ templateDir }),
         redis: {
             version: '5.0'
         },
@@ -27,12 +26,8 @@ module.exports = ({ templateDir } = {}) => ({
         mariadb: {
             version: '10.2'
         },
-        elasticsearch: {
-            version: '5.6.16'
-        },
-        composer: {
-            version: '1'
-        },
+        elasticsearch: elasticsearch68(),
+        composer: composer1(),
         varnish: varnish66({ templateDir }),
         sslTerminator: sslTerminator({ templateDir })
     },

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

@@ -1,10 +1,12 @@
-const path = require('path');
+const { elasticsearch68 } = require('../services/elasticsearch/versions');
 const { defaultMagentoConfig } = require('../magento-config');
 const { magento23PHPExtensionList } = require('../magento/required-php-extensions');
 const { repo } = require('../php/base-repo');
 const { php72 } = require('../php/versions');
-const { sslTerminator } = require('../ssl-terminator');
+const { sslTerminator } = require('../services/ssl-terminator');
 const { varnish66 } = require('../varnish/varnish-6-6');
+const { nginx118 } = require('../services/nginx/versions');
+const { composer1 } = require('../services/composer/versions');
 
 module.exports = ({ templateDir } = {}) => ({
     magentoVersion: '2.3.1',
@@ -14,10 +16,7 @@ module.exports = ({ templateDir } = {}) => ({
             extensions: magento23PHPExtensionList,
             baseImage: `${ repo }:php-7.2-magento-2.3`
         }),
-        nginx: {
-            version: '1.18.0',
-            configTemplate: path.join(templateDir || '', 'nginx.template.conf')
-        },
+        nginx: nginx118({ templateDir }),
         redis: {
             version: '5'
         },
@@ -27,12 +26,8 @@ module.exports = ({ templateDir } = {}) => ({
         mariadb: {
             version: '10.2'
         },
-        elasticsearch: {
-            version: '6.8.16'
-        },
-        composer: {
-            version: '1'
-        },
+        elasticsearch: elasticsearch68(),
+        composer: composer1(),
         varnish: varnish66({ templateDir }),
         sslTerminator: sslTerminator({ templateDir })
     },