@lando/drupal 1.4.0 → 1.6.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -0,0 +1 @@
1
+ {"/home/runner/work/drupal/drupal/lib/utils.js":{"path":"/home/runner/work/drupal/drupal/lib/utils.js","statementMap":{"0":{"start":{"line":4,"column":10},"end":{"line":4,"column":27}},"1":{"start":{"line":5,"column":13},"end":{"line":5,"column":28}},"2":{"start":{"line":11,"column":0},"end":{"line":23,"column":2}},"3":{"start":{"line":13,"column":2},"end":{"line":13,"column":41}},"4":{"start":{"line":13,"column":25},"end":{"line":13,"column":41}},"5":{"start":{"line":15,"column":22},"end":{"line":20,"column":3}},"6":{"start":{"line":22,"column":2},"end":{"line":22,"column":63}},"7":{"start":{"line":22,"column":35},"end":{"line":22,"column":48}},"8":{"start":{"line":26,"column":19},"end":{"line":37,"column":1}},"9":{"start":{"line":39,"column":17},"end":{"line":50,"column":1}},"10":{"start":{"line":52,"column":20},"end":{"line":64,"column":1}},"11":{"start":{"line":69,"column":20},"end":{"line":69,"column":107}},"12":{"start":{"line":69,"column":31},"end":{"line":69,"column":107}},"13":{"start":{"line":74,"column":0},"end":{"line":94,"column":2}},"14":{"start":{"line":76,"column":2},"end":{"line":76,"column":30}},"15":{"start":{"line":77,"column":2},"end":{"line":77,"column":31}},"16":{"start":{"line":79,"column":2},"end":{"line":93,"column":3}},"17":{"start":{"line":80,"column":4},"end":{"line":80,"column":29}},"18":{"start":{"line":81,"column":9},"end":{"line":93,"column":3}},"19":{"start":{"line":83,"column":4},"end":{"line":83,"column":29}},"20":{"start":{"line":84,"column":9},"end":{"line":93,"column":3}},"21":{"start":{"line":85,"column":4},"end":{"line":85,"column":33}},"22":{"start":{"line":86,"column":9},"end":{"line":93,"column":3}},"23":{"start":{"line":87,"column":4},"end":{"line":87,"column":31}},"24":{"start":{"line":88,"column":9},"end":{"line":93,"column":3}},"25":{"start":{"line":89,"column":4},"end":{"line":92,"column":7}},"26":{"start":{"line":99,"column":0},"end":{"line":104,"column":2}},"27":{"start":{"line":99,"column":40},"end":{"line":104,"column":1}},"28":{"start":{"line":110,"column":0},"end":{"line":122,"column":2}},"29":{"start":{"line":112,"column":2},"end":{"line":112,"column":41}},"30":{"start":{"line":112,"column":25},"end":{"line":112,"column":41}},"31":{"start":{"line":114,"column":22},"end":{"line":119,"column":3}},"32":{"start":{"line":121,"column":2},"end":{"line":121,"column":63}},"33":{"start":{"line":121,"column":35},"end":{"line":121,"column":48}},"34":{"start":{"line":127,"column":0},"end":{"line":139,"column":2}},"35":{"start":{"line":128,"column":17},"end":{"line":128,"column":19}},"36":{"start":{"line":129,"column":2},"end":{"line":137,"column":5}},"37":{"start":{"line":130,"column":4},"end":{"line":136,"column":5}},"38":{"start":{"line":131,"column":6},"end":{"line":131,"column":42}},"39":{"start":{"line":132,"column":11},"end":{"line":136,"column":5}},"40":{"start":{"line":133,"column":6},"end":{"line":135,"column":7}},"41":{"start":{"line":134,"column":8},"end":{"line":134,"column":79}},"42":{"start":{"line":138,"column":2},"end":{"line":138,"column":16}},"43":{"start":{"line":144,"column":0},"end":{"line":153,"column":3}},"44":{"start":{"line":144,"column":39},"end":{"line":153,"column":2}}},"fnMap":{"0":{"name":"(anonymous_0)","decl":{"start":{"line":11,"column":18},"end":{"line":11,"column":19}},"loc":{"start":{"line":11,"column":54},"end":{"line":23,"column":1}},"line":11},"1":{"name":"(anonymous_1)","decl":{"start":{"line":22,"column":28},"end":{"line":22,"column":29}},"loc":{"start":{"line":22,"column":35},"end":{"line":22,"column":48}},"line":22},"2":{"name":"(anonymous_2)","decl":{"start":{"line":69,"column":20},"end":{"line":69,"column":21}},"loc":{"start":{"line":69,"column":31},"end":{"line":69,"column":107}},"line":69},"3":{"name":"(anonymous_3)","decl":{"start":{"line":74,"column":23},"end":{"line":74,"column":24}},"loc":{"start":{"line":74,"column":35},"end":{"line":94,"column":1}},"line":74},"4":{"name":"(anonymous_4)","decl":{"start":{"line":99,"column":19},"end":{"line":99,"column":20}},"loc":{"start":{"line":99,"column":40},"end":{"line":104,"column":1}},"line":99},"5":{"name":"(anonymous_5)","decl":{"start":{"line":110,"column":18},"end":{"line":110,"column":19}},"loc":{"start":{"line":110,"column":54},"end":{"line":122,"column":1}},"line":110},"6":{"name":"(anonymous_6)","decl":{"start":{"line":121,"column":28},"end":{"line":121,"column":29}},"loc":{"start":{"line":121,"column":35},"end":{"line":121,"column":48}},"line":121},"7":{"name":"(anonymous_7)","decl":{"start":{"line":127,"column":27},"end":{"line":127,"column":28}},"loc":{"start":{"line":127,"column":77},"end":{"line":139,"column":1}},"line":127},"8":{"name":"(anonymous_8)","decl":{"start":{"line":129,"column":19},"end":{"line":129,"column":20}},"loc":{"start":{"line":129,"column":27},"end":{"line":137,"column":3}},"line":129},"9":{"name":"(anonymous_9)","decl":{"start":{"line":144,"column":22},"end":{"line":144,"column":23}},"loc":{"start":{"line":144,"column":39},"end":{"line":153,"column":2}},"line":144}},"branchMap":{"0":{"loc":{"start":{"line":11,"column":35},"end":{"line":11,"column":49}},"type":"default-arg","locations":[{"start":{"line":11,"column":43},"end":{"line":11,"column":49}}],"line":11},"1":{"loc":{"start":{"line":13,"column":2},"end":{"line":13,"column":41}},"type":"if","locations":[{"start":{"line":13,"column":2},"end":{"line":13,"column":41}},{"start":{"line":13,"column":2},"end":{"line":13,"column":41}}],"line":13},"2":{"loc":{"start":{"line":79,"column":2},"end":{"line":93,"column":3}},"type":"if","locations":[{"start":{"line":79,"column":2},"end":{"line":93,"column":3}},{"start":{"line":79,"column":2},"end":{"line":93,"column":3}}],"line":79},"3":{"loc":{"start":{"line":81,"column":9},"end":{"line":93,"column":3}},"type":"if","locations":[{"start":{"line":81,"column":9},"end":{"line":93,"column":3}},{"start":{"line":81,"column":9},"end":{"line":93,"column":3}}],"line":81},"4":{"loc":{"start":{"line":81,"column":13},"end":{"line":81,"column":43}},"type":"binary-expr","locations":[{"start":{"line":81,"column":13},"end":{"line":81,"column":29}},{"start":{"line":81,"column":33},"end":{"line":81,"column":43}}],"line":81},"5":{"loc":{"start":{"line":84,"column":9},"end":{"line":93,"column":3}},"type":"if","locations":[{"start":{"line":84,"column":9},"end":{"line":93,"column":3}},{"start":{"line":84,"column":9},"end":{"line":93,"column":3}}],"line":84},"6":{"loc":{"start":{"line":86,"column":9},"end":{"line":93,"column":3}},"type":"if","locations":[{"start":{"line":86,"column":9},"end":{"line":93,"column":3}},{"start":{"line":86,"column":9},"end":{"line":93,"column":3}}],"line":86},"7":{"loc":{"start":{"line":88,"column":9},"end":{"line":93,"column":3}},"type":"if","locations":[{"start":{"line":88,"column":9},"end":{"line":93,"column":3}},{"start":{"line":88,"column":9},"end":{"line":93,"column":3}}],"line":88},"8":{"loc":{"start":{"line":110,"column":35},"end":{"line":110,"column":49}},"type":"default-arg","locations":[{"start":{"line":110,"column":43},"end":{"line":110,"column":49}}],"line":110},"9":{"loc":{"start":{"line":112,"column":2},"end":{"line":112,"column":41}},"type":"if","locations":[{"start":{"line":112,"column":2},"end":{"line":112,"column":41}},{"start":{"line":112,"column":2},"end":{"line":112,"column":41}}],"line":112},"10":{"loc":{"start":{"line":127,"column":37},"end":{"line":127,"column":72}},"type":"default-arg","locations":[{"start":{"line":127,"column":45},"end":{"line":127,"column":72}}],"line":127},"11":{"loc":{"start":{"line":130,"column":4},"end":{"line":136,"column":5}},"type":"if","locations":[{"start":{"line":130,"column":4},"end":{"line":136,"column":5}},{"start":{"line":130,"column":4},"end":{"line":136,"column":5}}],"line":130},"12":{"loc":{"start":{"line":132,"column":11},"end":{"line":136,"column":5}},"type":"if","locations":[{"start":{"line":132,"column":11},"end":{"line":136,"column":5}},{"start":{"line":132,"column":11},"end":{"line":136,"column":5}}],"line":132},"13":{"loc":{"start":{"line":132,"column":15},"end":{"line":132,"column":90}},"type":"binary-expr","locations":[{"start":{"line":132,"column":15},"end":{"line":132,"column":48}},{"start":{"line":132,"column":52},"end":{"line":132,"column":90}}],"line":132},"14":{"loc":{"start":{"line":133,"column":6},"end":{"line":135,"column":7}},"type":"if","locations":[{"start":{"line":133,"column":6},"end":{"line":135,"column":7}},{"start":{"line":133,"column":6},"end":{"line":135,"column":7}}],"line":133}},"s":{"0":0,"1":0,"2":0,"3":0,"4":0,"5":0,"6":0,"7":0,"8":0,"9":0,"10":0,"11":0,"12":0,"13":0,"14":0,"15":0,"16":0,"17":0,"18":0,"19":0,"20":0,"21":0,"22":0,"23":0,"24":0,"25":0,"26":0,"27":0,"28":0,"29":0,"30":0,"31":0,"32":0,"33":0,"34":0,"35":0,"36":0,"37":0,"38":0,"39":0,"40":0,"41":0,"42":0,"43":0,"44":0},"f":{"0":0,"1":0,"2":0,"3":0,"4":0,"5":0,"6":0,"7":0,"8":0,"9":0},"b":{"0":[0],"1":[0,0],"2":[0,0],"3":[0,0],"4":[0,0],"5":[0,0],"6":[0,0],"7":[0,0],"8":[0],"9":[0,0],"10":[0],"11":[0,0],"12":[0,0],"13":[0,0],"14":[0,0]},"all":true},"/home/runner/work/drupal/drupal/lib/warnings.js":{"path":"/home/runner/work/drupal/drupal/lib/warnings.js","statementMap":{"0":{"start":{"line":5,"column":0},"end":{"line":13,"column":3}},"1":{"start":{"line":5,"column":32},"end":{"line":13,"column":1}}},"fnMap":{"0":{"name":"(anonymous_0)","decl":{"start":{"line":5,"column":20},"end":{"line":5,"column":21}},"loc":{"start":{"line":5,"column":32},"end":{"line":13,"column":1}},"line":5}},"branchMap":{},"s":{"0":0,"1":0},"f":{"0":0},"b":{},"all":true}}
@@ -0,0 +1 @@
1
+ {"parent":null,"pid":2017,"argv":["/opt/hostedtoolcache/node/18.20.2/x64/bin/node","/home/runner/work/drupal/drupal/node_modules/.bin/nyc","--reporter=html","--reporter=text","mocha","--timeout","5000","test/**/*.spec.js"],"execArgv":[],"cwd":"/home/runner/work/drupal/drupal","time":1716838013031,"ppid":2016,"coverageFilename":"/home/runner/work/drupal/drupal/.nyc_output/a429ea73-cd15-4ad9-a2ac-1365773339cf.json","externalId":"","uuid":"a429ea73-cd15-4ad9-a2ac-1365773339cf","files":["/home/runner/work/drupal/drupal/lib/utils.js","/home/runner/work/drupal/drupal/lib/warnings.js"]}
@@ -0,0 +1 @@
1
+ {"parent":null,"pid":2028,"argv":["/opt/hostedtoolcache/node/18.20.2/x64/bin/node","/home/runner/work/drupal/drupal/node_modules/.bin/mocha","--timeout","5000","test/**/*.spec.js"],"execArgv":[],"cwd":"/home/runner/work/drupal/drupal","time":1716838013477,"ppid":2017,"coverageFilename":"/home/runner/work/drupal/drupal/.nyc_output/d414c776-d2a1-41d8-8549-8b0524ed17c8.json","externalId":"","uuid":"d414c776-d2a1-41d8-8549-8b0524ed17c8","files":[]}
@@ -1 +1 @@
1
- {"processes":{"6263b5b0-dc1a-4c4a-a3df-dcd91408d89e":{"parent":null,"children":[]},"e55d54a9-a2cd-4da5-8d02-66aebb969d98":{"parent":null,"children":[]}},"files":{"/home/runner/work/drupal/drupal/lib/utils.js":["6263b5b0-dc1a-4c4a-a3df-dcd91408d89e"],"/home/runner/work/drupal/drupal/lib/warnings.js":["6263b5b0-dc1a-4c4a-a3df-dcd91408d89e"]},"externalIds":{}}
1
+ {"processes":{"a429ea73-cd15-4ad9-a2ac-1365773339cf":{"parent":null,"children":[]},"d414c776-d2a1-41d8-8549-8b0524ed17c8":{"parent":null,"children":[]}},"files":{"/home/runner/work/drupal/drupal/lib/utils.js":["a429ea73-cd15-4ad9-a2ac-1365773339cf"],"/home/runner/work/drupal/drupal/lib/warnings.js":["a429ea73-cd15-4ad9-a2ac-1365773339cf"]},"externalIds":{}}
package/CHANGELOG.md CHANGED
@@ -1,10 +1,21 @@
1
+ ## {{ UNRELEASED_VERSION }} - [{{ UNRELEASED_DATE }}]({{ UNRELEASED_LINK }})
2
+
3
+ ## v1.6.0 - [May 27, 2024](https://github.com/lando/drupal/releases/tag/v1.6.0)
4
+
5
+ * Use mysql command for MariaDB 10.3.x and below
6
+
7
+ ## v1.5.0 - [May 8, 2024](https://github.com/lando/drupal/releases/tag/v1.5.0)
8
+
9
+ * Updated mariadb plugin and added tooling support for the mariadb executable. [#51](https://github.com/lando/mariadb/issues/51
10
+ * Added support for Drupal 11. [#109](https://github.com/lando/drupal/pull/109)
11
+
1
12
  ## v1.4.0 - [April 16, 2024](https://github.com/lando/drupal/releases/tag/v1.4.0)
2
-
3
- * Updated version of Composer used with Drupal 9 and 10 to `2-latest`. [#31](https://github.com/lando/drupal/issues/31)
13
+
14
+ * Updated version of Composer used with Drupal 9 and 10 to `2-latest`. [#31](https://github.com/lando/drupal/issues/31)
4
15
 
5
16
  ## v1.3.0 - [March 8, 2024](https://github.com/lando/drupal/releases/tag/v1.3.0)
6
17
 
7
- * Updated to latest database services.
18
+ * Updated to latest database services.
8
19
 
9
20
  ## v1.2.0 - [February 26, 2024](https://github.com/lando/drupal/releases/tag/v1.2.0)
10
21
 
@@ -18,11 +29,11 @@
18
29
  * Included ability to specify `database: mssql` in the `config` section to maintain backwards compatibility. [@lando/mssql#31](https://github.com/lando/mssql/issues/31)
19
30
 
20
31
  ## v1.0.1 - [January 15, 2024](https://github.com/lando/drupal/releases/tag/v1.0.1)
21
-
32
+
22
33
  * Fixed issue with missing `semver` dependency.
23
34
 
24
35
  ## v1.0.0 - [December 7, 2023](https://github.com/lando/drupal/releases/tag/v1.0.0)
25
-
36
+
26
37
  * Dialed fully for `lando update`
27
38
 
28
39
  ## v0.12.0 - [October 4, 2023](https://github.com/lando/drupal/releases/tag/v0.12.0)
package/README.md CHANGED
@@ -3,7 +3,7 @@
3
3
  This is the _official_ [Lando](https://lando.dev) plugin for [Drupal](https://www.drupal.org/). When installed it...
4
4
 
5
5
  * Allows users to run `drupal` cms
6
- * Allows users to configure `php` version from `5.3` all the way to `8.1`
6
+ * Allows users to configure `php` version from `5.3` all the way to `8.3`
7
7
  * Allows users to configure `webroot`
8
8
  * Allows users to configure web server to (`apache` or `nginx`)
9
9
  * Allows users to configure database backend to (`mariadb`, `mysql`, or `postgres`)
@@ -61,7 +61,7 @@ git clone https://github.com/lando/drupal.git && cd drupal
61
61
  yarn install
62
62
  ```
63
63
 
64
- If you dont' want to install Node 14 or Yarn for whatever reason you can install [Lando](https://docs.lando.dev/basics/installation.html) and use that:
64
+ If you don't want to install Node 18 or Yarn for whatever reason you can install [Lando](https://docs.lando.dev/basics/installation.html) and use that:
65
65
 
66
66
  ```bash
67
67
  git clone https://github.com/lando/drupal.git && cd drupal
@@ -57,7 +57,20 @@ const toolingDefaults = {
57
57
  },
58
58
  };
59
59
 
60
- // Default DB cli commands
60
+ // MariaDB cli commands
61
+ const mariadbCli = {
62
+ service: ':host',
63
+ description: 'Drops into a MariaDB shell on a database service',
64
+ cmd: 'mariadb -uroot',
65
+ options: {
66
+ host: {
67
+ description: 'The database service to use',
68
+ default: 'database',
69
+ alias: ['h'],
70
+ },
71
+ },
72
+ };
73
+ // MySQL cli commands
61
74
  const mysqlCli = {
62
75
  service: ':host',
63
76
  description: 'Drops into a MySQL shell on a database service',
@@ -70,6 +83,7 @@ const mysqlCli = {
70
83
  },
71
84
  },
72
85
  };
86
+ // Postgres cli commands
73
87
  const postgresCli = {
74
88
  service: ':host',
75
89
  description: 'Drops into a psql shell on a database service',
@@ -149,13 +163,19 @@ const getServices = options => ({
149
163
  */
150
164
  const getDbTooling = database => {
151
165
  // Make sure we strip out any version number
152
- database = database.split(':')[0];
166
+ const db = database.split(':')[0];
167
+ const ver = database.split(':')[1];
153
168
  // Choose wisely
154
- if (_.includes(['mysql', 'mariadb'], database)) {
169
+ if (db === 'mysql') {
170
+ return {mysql: mysqlCli};
171
+ } else if (db === 'mariadb' && ver < 10.4) {
172
+ // Use mysql command for MariaDB 10.3.x and below
155
173
  return {mysql: mysqlCli};
156
- } else if (database === 'postgres') {
174
+ } else if (db === 'mariadb') {
175
+ return {mariadb: mariadbCli};
176
+ } else if (db === 'postgres') {
157
177
  return {psql: postgresCli};
158
- } else if (database === 'mongo') {
178
+ } else if (db === 'mongo') {
159
179
  return {mongo: {
160
180
  service: 'database',
161
181
  description: 'Drop into the mongo shell',
@@ -0,0 +1,43 @@
1
+ 'use strict';
2
+
3
+ // Modules
4
+ const _ = require('lodash');
5
+ const path = require('path');
6
+
7
+ /*
8
+ * Build Drupal 11
9
+ */
10
+ module.exports = {
11
+ name: 'drupal11',
12
+ parent: '_drupaly',
13
+ config: {
14
+ confSrc: path.resolve(__dirname, '..', 'config', 'drupal11'),
15
+ defaultFiles: {},
16
+ php: '8.3',
17
+ drush: '^13',
18
+ composer_version: '2-latest',
19
+ },
20
+ builder: (parent, config) => class LandoDrupal11 extends parent {
21
+ constructor(id, options = {}) {
22
+ options = _.merge({}, config, options);
23
+ // Set drush to false
24
+ options.drush = false;
25
+
26
+ // Let's make sure we set appropriate default versions for things
27
+ // See: https://www.drupal.org/docs/system-requirements/database-server-requirements
28
+ switch (_.get(options, 'database', 'mysql')) {
29
+ case 'mysql':
30
+ options.database = 'mysql:8.0';
31
+ break;
32
+ case 'mariadb':
33
+ options.database = 'mariadb:10.6';
34
+ break;
35
+ case 'postgres':
36
+ options.database = 'postgres:16';
37
+ break;
38
+ }
39
+ // Send it downstream
40
+ super(id, options);
41
+ };
42
+ },
43
+ };
@@ -0,0 +1,116 @@
1
+ # LANDODRUPALNGINXCONF
2
+
3
+ server {
4
+ listen 80 default_server;
5
+ listen 443 ssl;
6
+ server_name localhost;
7
+ ssl_certificate /certs/cert.crt;
8
+ ssl_certificate_key /certs/cert.key;
9
+ ssl_verify_client off;
10
+ ssl_session_cache shared:SSL:1m;
11
+ ssl_session_timeout 5m;
12
+ ssl_ciphers HIGH:!aNULL:!MD5;
13
+ ssl_prefer_server_ciphers on;
14
+ port_in_redirect off;
15
+ client_max_body_size 100M;
16
+ root "{{LANDO_WEBROOT}}";
17
+ location = /favicon.ico {
18
+ log_not_found off;
19
+ access_log off;
20
+ }
21
+
22
+ location = /robots.txt {
23
+ allow all;
24
+ log_not_found off;
25
+ access_log off;
26
+ }
27
+
28
+ # Very rarely should these ever be accessed outside of your lan
29
+ location ~* \.(txt|log)$ {
30
+ allow 192.168.0.0/16;
31
+ deny all;
32
+ }
33
+
34
+ location ~ \..*/.*\.php$ {
35
+ return 403;
36
+ }
37
+
38
+ location ~ ^/sites/.*/private/ {
39
+ return 403;
40
+ }
41
+
42
+ # Allow "Well-Known URIs" as per RFC 5785
43
+ location ~* ^/.well-known/ {
44
+ allow all;
45
+ }
46
+
47
+ # Block access to "hidden" files and directories whose names begin with a
48
+ # period. This includes directories used by version control systems such
49
+ # as Subversion or Git to store control files.
50
+ location ~ (^|/)\. {
51
+ return 403;
52
+ }
53
+
54
+ location / {
55
+ # try_files $uri @rewrite; # For Drupal <= 6
56
+ try_files $uri /index.php?$query_string; # For Drupal >= 7
57
+ }
58
+
59
+ location @rewrite {
60
+ #rewrite ^/(.*)$ /index.php?q=$1; # For Drupal <= 6
61
+ rewrite ^ /index.php; # For Drupal >= 7
62
+ }
63
+
64
+ # Don't allow direct access to PHP files in the vendor directory.
65
+ location ~ /vendor/.*\.php$ {
66
+ deny all;
67
+ return 404;
68
+ }
69
+
70
+ # In Drupal 11, we must also match new paths where the '.php' appears in
71
+ # the middle, such as update.php/selection. The rule we use is strict,
72
+ # and only allows this pattern with the update.php front controller.
73
+ # This allows legacy path aliases in the form of
74
+ # blog/index.php/legacy-path to continue to route to Drupal nodes. If
75
+ # you do not have any paths like that, then you might prefer to use a
76
+ # laxer rule, such as:
77
+ # location ~ \.php(/|$) {
78
+ # The laxer rule will continue to work if Drupal uses this new URL
79
+ # pattern with front controllers other than update.php in a future
80
+ # release.
81
+ location ~ '\.php$|^/update.php' {
82
+ fastcgi_split_path_info ^(.+?\.php)(|/.*)$;
83
+ # Security note: If you're running a version of PHP older than the
84
+ # latest 5.3, you should have "cgi.fix_pathinfo = 0;" in php.ini.
85
+ # See http://serverfault.com/q/627903/94922 for details.
86
+ include fastcgi_params;
87
+ # Block httpoxy attacks. See https://httpoxy.org/.
88
+ fastcgi_param HTTP_PROXY "";
89
+ fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
90
+ fastcgi_param PATH_INFO $fastcgi_path_info;
91
+ fastcgi_param QUERY_STRING $query_string;
92
+ fastcgi_intercept_errors on;
93
+ # PHP 5 socket location.
94
+ #fastcgi_pass unix:/var/run/php5-fpm.sock;
95
+ # PHP 7 socket location.
96
+ #fastcgi_pass unix:/var/run/php/php7.0-fpm.sock;
97
+ #lando
98
+ fastcgi_pass fpm:9000;
99
+ }
100
+ # Fighting with Styles? This little gem is amazing.
101
+ # location ~ ^/sites/.*/files/imagecache/ { # For Drupal <= 6
102
+ location ~ ^(/[a-z\-]+)?/sites/.*/files/(css|js|styles)/ { # For Drupal >= 7
103
+ try_files $uri @rewrite;
104
+ }
105
+ # Handle private files through Drupal. Private file's path can come
106
+ # with a language prefix.
107
+ location ~ ^(/[a-z\-]+)?/system/files/ { # For Drupal >= 7
108
+ try_files $uri /index.php?$query_string;
109
+ }
110
+
111
+ location ~* \.(js|css|png|jpg|jpeg|gif|ico)$ {
112
+ expires max;
113
+ log_not_found off;
114
+ }
115
+
116
+ }
@@ -0,0 +1,111 @@
1
+ #
2
+ # The MySQL database server configuration file for Lando
3
+ #
4
+ # LANDODRUPALMYSQLCNF
5
+
6
+ [mysqld]
7
+ #
8
+ # * Basic Settings
9
+ #
10
+ # Data is stored in a volume on the db container /sql
11
+ default-storage-engine = innodb
12
+
13
+ #
14
+ # * Fine Tuning
15
+ #
16
+ key_buffer_size = 384M
17
+ max_allowed_packet = 32M
18
+ thread_stack = 400K
19
+ thread_cache_size = 8
20
+ # This replaces the startup script and checks MyISAM tables if needed
21
+ # the first time they are touched
22
+ #max_connections = 100
23
+ #table_cache = 64
24
+ #thread_concurrency = 10
25
+ read_rnd_buffer_size = 8M
26
+ myisam_sort_buffer_size = 64M
27
+ table_open_cache = 512
28
+ sort_buffer_size = 2M
29
+ read_buffer_size = 2M
30
+
31
+ #
32
+ # * Query Cache Configuration
33
+ #
34
+ query_cache_limit = 1M
35
+ query_cache_size = 64M
36
+ #
37
+ # * Logging and Replication
38
+ #
39
+ # Both location gets rotated by the cronjob.
40
+ # Be aware that this log type is a performance killer.
41
+ # As of 5.1 you can enable the log at runtime!
42
+ #general_log_file = /src/.lando/log/mysql.log
43
+ #general_log = 1
44
+ #
45
+ # Error logging goes to syslog due to /etc/mysql/conf.d/mysqld_safe_syslog.cnf.
46
+ #
47
+ # Here you can see queries with especially long duration
48
+ #log_slow_queries = /var/log/mysql/mysql-slow.log
49
+ #long_query_time = 2
50
+ #log-queries-not-using-indexes
51
+ #
52
+ # The following can be used as easy to replay backup logs or for replication.
53
+ # note: if you are setting up a replication slave, see README.Debian about
54
+ # other settings you may need to change.
55
+ #server-id = 1
56
+ #log_bin = /src/.lando/log/mysql-bin.log
57
+ expire_logs_days = 10
58
+ max_binlog_size = 100M
59
+ #binlog_do_db = include_database_name
60
+ #binlog_ignore_db = include_database_name
61
+ #
62
+ # * InnoDB
63
+ #
64
+ # InnoDB is enabled by default with a 10MB datafile in /var/lib/mysql/.
65
+ # Read the manual for more InnoDB related options. There are many!
66
+ #
67
+ # Uncomment the following if you are using InnoDB tables
68
+ #innodb_data_file_path = ibdata1:2000M;ibdata2:10M:autoextend
69
+ #innodb_log_group_home_dir = C:\mysql\data/
70
+ # You can set .._buffer_pool_size up to 50 - 80 %
71
+ # of RAM but beware of setting memory usage too high
72
+ #innodb_buffer_pool_size = 384M
73
+ #innodb_additional_mem_pool_size = 20M
74
+ # Set .._log_file_size to 25 % of buffer pool size
75
+ innodb_log_file_size = 101M
76
+ #innodb_log_buffer_size = 8M
77
+ innodb_flush_log_at_trx_commit = 0
78
+ #innodb_lock_wait_timeout = 50
79
+ innodb_buffer_pool_size = 384M
80
+ innodb_log_buffer_size = 4M
81
+ innodb_file_per_table = 1
82
+ innodb_open_files = 256
83
+ innodb_io_capacity = 512
84
+ innodb_flush_method = O_DIRECT
85
+ innodb_thread_concurrency = 8
86
+ innodb_lock_wait_timeout = 121
87
+ #
88
+ # * Security Features
89
+ #
90
+ # Read the manual, too, if you want chroot!
91
+ # chroot = /var/lib/mysql/
92
+ #
93
+ # For generating SSL certificates I recommend the OpenSSL GUI "tinyca".
94
+ #
95
+ # ssl-ca=/etc/mysql/cacert.pem
96
+ # ssl-cert=/etc/mysql/server-cert.pem
97
+ # ssl-key=/etc/mysql/server-key.pem
98
+
99
+ [mysqldump]
100
+ quick
101
+ quote-names
102
+ max_allowed_packet = 32M
103
+
104
+ [mysql]
105
+ #no-auto-rehash # faster start of mysql but no tab completion
106
+
107
+ [isamchk]
108
+ key_buffer_size = 384M
109
+ sort_buffer_size = 256M
110
+ read_buffer = 2M
111
+ write_buffer = 2M
@@ -0,0 +1,106 @@
1
+ #
2
+ # The MySQL database server configuration file for Lando
3
+ #
4
+ # LANDODRUPALMYSQL8CNF
5
+
6
+ [mysqld]
7
+ #
8
+ # * Basic Settings
9
+ #
10
+ # Data is stored in a volume on the db container /sql
11
+ default-storage-engine = innodb
12
+
13
+ #
14
+ # * Fine Tuning
15
+ #
16
+ key_buffer_size = 384M
17
+ max_allowed_packet = 32M
18
+ thread_stack = 400K
19
+ thread_cache_size = 8
20
+ # This replaces the startup script and checks MyISAM tables if needed
21
+ # the first time they are touched
22
+ #max_connections = 100
23
+ #table_cache = 64
24
+ #thread_concurrency = 10
25
+ read_rnd_buffer_size = 8M
26
+ myisam_sort_buffer_size = 64M
27
+ table_open_cache = 512
28
+ sort_buffer_size = 2M
29
+ read_buffer_size = 2M
30
+
31
+ #
32
+ # * Logging and Replication
33
+ #
34
+ # Both location gets rotated by the cronjob.
35
+ # Be aware that this log type is a performance killer.
36
+ # As of 5.1 you can enable the log at runtime!
37
+ #general_log_file = /src/.lando/log/mysql.log
38
+ #general_log = 1
39
+ #
40
+ # Error logging goes to syslog due to /etc/mysql/conf.d/mysqld_safe_syslog.cnf.
41
+ #
42
+ # Here you can see queries with especially long duration
43
+ #log_slow_queries = /var/log/mysql/mysql-slow.log
44
+ #long_query_time = 2
45
+ #log-queries-not-using-indexes
46
+ #
47
+ # The following can be used as easy to replay backup logs or for replication.
48
+ # note: if you are setting up a replication slave, see README.Debian about
49
+ # other settings you may need to change.
50
+ #server-id = 1
51
+ #log_bin = /src/.lando/log/mysql-bin.log
52
+ expire_logs_days = 10
53
+ max_binlog_size = 101M
54
+ #binlog_do_db = include_database_name
55
+ #binlog_ignore_db = include_database_name
56
+ #
57
+ # * InnoDB
58
+ #
59
+ # InnoDB is enabled by default with a 10MB datafile in /var/lib/mysql/.
60
+ # Read the manual for more InnoDB related options. There are many!
61
+ #
62
+ # Uncomment the following if you are using InnoDB tables
63
+ #innodb_data_file_path = ibdata1:2000M;ibdata2:10M:autoextend
64
+ #innodb_log_group_home_dir = C:\mysql\data/
65
+ # You can set .._buffer_pool_size up to 50 - 80 %
66
+ # of RAM but beware of setting memory usage too high
67
+ #innodb_buffer_pool_size = 384M
68
+ #innodb_additional_mem_pool_size = 20M
69
+ # Set .._log_file_size to 25 % of buffer pool size
70
+ innodb_log_file_size = 100M
71
+ #innodb_log_buffer_size = 8M
72
+ innodb_flush_log_at_trx_commit = 0
73
+ #innodb_lock_wait_timeout = 50
74
+ innodb_buffer_pool_size = 384M
75
+ innodb_log_buffer_size = 4M
76
+ innodb_file_per_table = 1
77
+ innodb_open_files = 256
78
+ innodb_io_capacity = 512
79
+ innodb_flush_method = O_DIRECT
80
+ innodb_thread_concurrency = 8
81
+ innodb_lock_wait_timeout = 127
82
+ #
83
+ # * Security Features
84
+ #
85
+ # Read the manual, too, if you want chroot!
86
+ # chroot = /var/lib/mysql/
87
+ #
88
+ # For generating SSL certificates I recommend the OpenSSL GUI "tinyca".
89
+ #
90
+ # ssl-ca=/etc/mysql/cacert.pem
91
+ # ssl-cert=/etc/mysql/server-cert.pem
92
+ # ssl-key=/etc/mysql/server-key.pem
93
+
94
+ [mysqldump]
95
+ quick
96
+ quote-names
97
+ max_allowed_packet = 32M
98
+
99
+ [mysql]
100
+ #no-auto-rehash # faster start of mysql but no tab completion
101
+
102
+ [isamchk]
103
+ key_buffer_size = 384M
104
+ sort_buffer_size = 256M
105
+ read_buffer = 2M
106
+ write_buffer = 2M
@@ -0,0 +1,50 @@
1
+ [PHP]
2
+
3
+ ; LANDODRUPALPHPINI
4
+ ;;;;;;;;;;;;;;;
5
+ ; PHP Globals ;
6
+ ;;;;;;;;;;;;;;;
7
+
8
+ short_open_tag = Off
9
+ output_buffering = 4096
10
+ allow_call_time_pass_reference = Off
11
+ request_order = "GP"
12
+ register_long_arrays = Off
13
+ register_argc_argv = Off
14
+ magic_quotes_gpc = Off
15
+ enable_dl = Off
16
+ allow_url_fopen = On
17
+ realpath_cache_size = "800K"
18
+ realpath_cache_ttl = "86400"
19
+ disable_functions =
20
+ sendmail_path=/bin/true
21
+ ;include_path = ".:/usr/share/pear:/usr/share/php"
22
+
23
+ [Date]
24
+ date.timezone = "UTC"
25
+
26
+ ;;;;;;;;;;;;;;;;;;;;;;
27
+ ;; PACKAGE SETTINGS ;;
28
+ ;;;;;;;;;;;;;;;;;;;;;;
29
+
30
+ ; Xdebug
31
+ xdebug.max_nesting_level = 512
32
+ xdebug.show_exception_trace = 0
33
+ xdebug.collect_params = 0
34
+ xdebug.remote_autostart = 1
35
+ xdebug.start_with_request = trigger
36
+ xdebug.mode = ${XDEBUG_MODE}
37
+
38
+ ; Globals
39
+ expose_php = on
40
+ max_execution_time = 91
41
+ max_input_time = 901
42
+ max_input_vars = 10000
43
+ memory_limit = ${PHP_MEMORY_LIMIT}
44
+ upload_max_filesize = 100M
45
+ post_max_size = 100M
46
+ error_reporting = E_ALL & ~E_DEPRECATED
47
+ ignore_repeated_errors = on
48
+ html_errors = off
49
+ display_errors = on
50
+ log_errors = on
@@ -48,3 +48,7 @@ ignore_repeated_errors = on
48
48
  html_errors = off
49
49
  display_errors = on
50
50
  log_errors = on
51
+
52
+ ; Drupal 6
53
+ mbstring.http_input = pass
54
+ mbstring.http_output = pass
@@ -25,14 +25,14 @@
25
25
  <div class='fl pad1y space-right2'>
26
26
  <span class="strong">0% </span>
27
27
  <span class="quiet">Statements</span>
28
- <span class='fraction'>0/41</span>
28
+ <span class='fraction'>0/47</span>
29
29
  </div>
30
30
 
31
31
 
32
32
  <div class='fl pad1y space-right2'>
33
33
  <span class="strong">0% </span>
34
34
  <span class="quiet">Branches</span>
35
- <span class='fraction'>0/21</span>
35
+ <span class='fraction'>0/27</span>
36
36
  </div>
37
37
 
38
38
 
@@ -46,7 +46,7 @@
46
46
  <div class='fl pad1y space-right2'>
47
47
  <span class="strong">0% </span>
48
48
  <span class="quiet">Lines</span>
49
- <span class='fraction'>0/33</span>
49
+ <span class='fraction'>0/39</span>
50
50
  </div>
51
51
 
52
52
 
@@ -84,13 +84,13 @@
84
84
  <div class="chart"><div class="cover-fill" style="width: 0%"></div><div class="cover-empty" style="width: 100%"></div></div>
85
85
  </td>
86
86
  <td data-value="0" class="pct low">0%</td>
87
- <td data-value="39" class="abs low">0/39</td>
87
+ <td data-value="45" class="abs low">0/45</td>
88
88
  <td data-value="0" class="pct low">0%</td>
89
- <td data-value="21" class="abs low">0/21</td>
89
+ <td data-value="27" class="abs low">0/27</td>
90
90
  <td data-value="0" class="pct low">0%</td>
91
91
  <td data-value="10" class="abs low">0/10</td>
92
92
  <td data-value="0" class="pct low">0%</td>
93
- <td data-value="32" class="abs low">0/32</td>
93
+ <td data-value="38" class="abs low">0/38</td>
94
94
  </tr>
95
95
 
96
96
  <tr>
@@ -116,7 +116,7 @@
116
116
  <div class='footer quiet pad2 space-top1 center small'>
117
117
  Code coverage generated by
118
118
  <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
119
- at 2024-04-16T17:38:29.559Z
119
+ at 2024-05-27T19:26:53.668Z
120
120
  </div>
121
121
  <script src="prettify.js"></script>
122
122
  <script>
@@ -25,14 +25,14 @@
25
25
  <div class='fl pad1y space-right2'>
26
26
  <span class="strong">0% </span>
27
27
  <span class="quiet">Statements</span>
28
- <span class='fraction'>0/39</span>
28
+ <span class='fraction'>0/45</span>
29
29
  </div>
30
30
 
31
31
 
32
32
  <div class='fl pad1y space-right2'>
33
33
  <span class="strong">0% </span>
34
34
  <span class="quiet">Branches</span>
35
- <span class='fraction'>0/21</span>
35
+ <span class='fraction'>0/27</span>
36
36
  </div>
37
37
 
38
38
 
@@ -46,7 +46,7 @@
46
46
  <div class='fl pad1y space-right2'>
47
47
  <span class="strong">0% </span>
48
48
  <span class="quiet">Lines</span>
49
- <span class='fraction'>0/32</span>
49
+ <span class='fraction'>0/38</span>
50
50
  </div>
51
51
 
52
52
 
@@ -196,7 +196,27 @@
196
196
  <a name='L131'></a><a href='#L131'>131</a>
197
197
  <a name='L132'></a><a href='#L132'>132</a>
198
198
  <a name='L133'></a><a href='#L133'>133</a>
199
- <a name='L134'></a><a href='#L134'>134</a></td><td class="line-coverage quiet"><span class="cline-any cline-neutral">&nbsp;</span>
199
+ <a name='L134'></a><a href='#L134'>134</a>
200
+ <a name='L135'></a><a href='#L135'>135</a>
201
+ <a name='L136'></a><a href='#L136'>136</a>
202
+ <a name='L137'></a><a href='#L137'>137</a>
203
+ <a name='L138'></a><a href='#L138'>138</a>
204
+ <a name='L139'></a><a href='#L139'>139</a>
205
+ <a name='L140'></a><a href='#L140'>140</a>
206
+ <a name='L141'></a><a href='#L141'>141</a>
207
+ <a name='L142'></a><a href='#L142'>142</a>
208
+ <a name='L143'></a><a href='#L143'>143</a>
209
+ <a name='L144'></a><a href='#L144'>144</a>
210
+ <a name='L145'></a><a href='#L145'>145</a>
211
+ <a name='L146'></a><a href='#L146'>146</a>
212
+ <a name='L147'></a><a href='#L147'>147</a>
213
+ <a name='L148'></a><a href='#L148'>148</a>
214
+ <a name='L149'></a><a href='#L149'>149</a>
215
+ <a name='L150'></a><a href='#L150'>150</a>
216
+ <a name='L151'></a><a href='#L151'>151</a>
217
+ <a name='L152'></a><a href='#L152'>152</a>
218
+ <a name='L153'></a><a href='#L153'>153</a>
219
+ <a name='L154'></a><a href='#L154'>154</a></td><td class="line-coverage quiet"><span class="cline-any cline-neutral">&nbsp;</span>
200
220
  <span class="cline-any cline-neutral">&nbsp;</span>
201
221
  <span class="cline-any cline-neutral">&nbsp;</span>
202
222
  <span class="cline-any cline-no">&nbsp;</span>
@@ -233,6 +253,20 @@
233
253
  <span class="cline-any cline-neutral">&nbsp;</span>
234
254
  <span class="cline-any cline-neutral">&nbsp;</span>
235
255
  <span class="cline-any cline-neutral">&nbsp;</span>
256
+ <span class="cline-any cline-neutral">&nbsp;</span>
257
+ <span class="cline-any cline-no">&nbsp;</span>
258
+ <span class="cline-any cline-neutral">&nbsp;</span>
259
+ <span class="cline-any cline-neutral">&nbsp;</span>
260
+ <span class="cline-any cline-neutral">&nbsp;</span>
261
+ <span class="cline-any cline-neutral">&nbsp;</span>
262
+ <span class="cline-any cline-neutral">&nbsp;</span>
263
+ <span class="cline-any cline-neutral">&nbsp;</span>
264
+ <span class="cline-any cline-neutral">&nbsp;</span>
265
+ <span class="cline-any cline-neutral">&nbsp;</span>
266
+ <span class="cline-any cline-neutral">&nbsp;</span>
267
+ <span class="cline-any cline-neutral">&nbsp;</span>
268
+ <span class="cline-any cline-neutral">&nbsp;</span>
269
+ <span class="cline-any cline-neutral">&nbsp;</span>
236
270
  <span class="cline-any cline-no">&nbsp;</span>
237
271
  <span class="cline-any cline-neutral">&nbsp;</span>
238
272
  <span class="cline-any cline-neutral">&nbsp;</span>
@@ -258,6 +292,11 @@
258
292
  <span class="cline-any cline-no">&nbsp;</span>
259
293
  <span class="cline-any cline-neutral">&nbsp;</span>
260
294
  <span class="cline-any cline-no">&nbsp;</span>
295
+ <span class="cline-any cline-no">&nbsp;</span>
296
+ <span class="cline-any cline-neutral">&nbsp;</span>
297
+ <span class="cline-any cline-no">&nbsp;</span>
298
+ <span class="cline-any cline-no">&nbsp;</span>
299
+ <span class="cline-any cline-no">&nbsp;</span>
261
300
  <span class="cline-any cline-neutral">&nbsp;</span>
262
301
  <span class="cline-any cline-no">&nbsp;</span>
263
302
  <span class="cline-any cline-no">&nbsp;</span>
@@ -265,6 +304,7 @@
265
304
  <span class="cline-any cline-no">&nbsp;</span>
266
305
  <span class="cline-any cline-no">&nbsp;</span>
267
306
  <span class="cline-any cline-no">&nbsp;</span>
307
+ <span class="cline-any cline-no">&nbsp;</span>
268
308
  <span class="cline-any cline-neutral">&nbsp;</span>
269
309
  <span class="cline-any cline-neutral">&nbsp;</span>
270
310
  <span class="cline-any cline-neutral">&nbsp;</span>
@@ -353,7 +393,20 @@ const path = <span class="cstat-no" title="statement not covered" >require('path
353
393
  <span class="cstat-no" title="statement not covered" > return _.map(pharInstall, <span class="fstat-no" title="function not covered" >cm</span>d =&gt; <span class="cstat-no" title="statement not covered" >cmd.join(' '))</span>.join(' &amp;&amp; ');</span>
354
394
  };
355
395
  &nbsp;
356
- // Default DB cli commands
396
+ // MariaDB cli commands
397
+ const mariadbCli = <span class="cstat-no" title="statement not covered" >{</span>
398
+ service: ':host',
399
+ description: 'Drops into a MariaDB shell on a database service',
400
+ cmd: 'mariadb -uroot',
401
+ options: {
402
+ host: {
403
+ description: 'The database service to use',
404
+ default: 'database',
405
+ alias: ['h'],
406
+ },
407
+ },
408
+ };
409
+ // MySQL cli commands
357
410
  const mysqlCli = <span class="cstat-no" title="statement not covered" >{</span>
358
411
  service: ':host',
359
412
  description: 'Drops into a MySQL shell on a database service',
@@ -366,6 +419,7 @@ const mysqlCli = <span class="cstat-no" title="statement not covered" >{</span>
366
419
  },
367
420
  },
368
421
  };
422
+ // Postgres cli commands
369
423
  const postgresCli = <span class="cstat-no" title="statement not covered" >{</span>
370
424
  service: ':host',
371
425
  description: 'Drops into a psql shell on a database service',
@@ -390,13 +444,19 @@ const getDrushUrl = <span class="cstat-no" title="statement not covered" ><span
390
444
  */
391
445
  <span class="cstat-no" title="statement not covered" >exports.getDbTooling = <span class="fstat-no" title="function not covered" >da</span>tabase =&gt; {</span>
392
446
  // Make sure we strip out any version number
393
- <span class="cstat-no" title="statement not covered" > database = database.split(':')[0];</span>
447
+ <span class="cstat-no" title="statement not covered" > db = database.split(':')[0];</span>
448
+ <span class="cstat-no" title="statement not covered" > ver = database.split(':')[1];</span>
394
449
  // Choose wisely
395
- <span class="cstat-no" title="statement not covered" > if (_.includes(['mysql', 'mariadb'], database)) {</span>
450
+ <span class="cstat-no" title="statement not covered" > if (db === 'mysql') {</span>
451
+ <span class="cstat-no" title="statement not covered" > return {mysql: mysqlCli};</span>
452
+ } else <span class="cstat-no" title="statement not covered" >if (db === 'mariadb' &amp;&amp; ver &lt; 10.4) {</span>
453
+ // Use mysql command for MariaDB 10.3.x and below
396
454
  <span class="cstat-no" title="statement not covered" > return {mysql: mysqlCli};</span>
397
- } else <span class="cstat-no" title="statement not covered" >if (database === 'postgres') {</span>
455
+ } else <span class="cstat-no" title="statement not covered" >if (db === 'mariadb') {</span>
456
+ <span class="cstat-no" title="statement not covered" > return {mariadb: mariadbCli};</span>
457
+ } else <span class="cstat-no" title="statement not covered" >if (db === 'postgres') {</span>
398
458
  <span class="cstat-no" title="statement not covered" > return {psql: postgresCli};</span>
399
- } else <span class="cstat-no" title="statement not covered" >if (database === 'mongo') {</span>
459
+ } else <span class="cstat-no" title="statement not covered" >if (db === 'mongo') {</span>
400
460
  <span class="cstat-no" title="statement not covered" > return {mongo: {</span>
401
461
  service: 'database',
402
462
  description: 'Drop into the mongo shell',
@@ -469,7 +529,7 @@ const getDrushUrl = <span class="cstat-no" title="statement not covered" ><span
469
529
  <div class='footer quiet pad2 space-top1 center small'>
470
530
  Code coverage generated by
471
531
  <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
472
- at 2024-04-16T17:38:29.559Z
532
+ at 2024-05-27T19:26:53.668Z
473
533
  </div>
474
534
  <script src="prettify.js"></script>
475
535
  <script>
@@ -109,7 +109,7 @@
109
109
  <div class='footer quiet pad2 space-top1 center small'>
110
110
  Code coverage generated by
111
111
  <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
112
- at 2024-04-16T17:38:29.559Z
112
+ at 2024-05-27T19:26:53.668Z
113
113
  </div>
114
114
  <script src="prettify.js"></script>
115
115
  <script>
@@ -0,0 +1,8 @@
1
+ 'use strict';
2
+
3
+ /*
4
+ * Init Lamp
5
+ */
6
+ module.exports = {
7
+ name: 'drupal11',
8
+ };
package/lib/utils.js CHANGED
@@ -22,7 +22,20 @@ exports.getPhar = (url, src, dest, check = 'true') => {
22
22
  return _.map(pharInstall, cmd => cmd.join(' ')).join(' && ');
23
23
  };
24
24
 
25
- // Default DB cli commands
25
+ // MariaDB cli commands
26
+ const mariadbCli = {
27
+ service: ':host',
28
+ description: 'Drops into a MariaDB shell on a database service',
29
+ cmd: 'mariadb -uroot',
30
+ options: {
31
+ host: {
32
+ description: 'The database service to use',
33
+ default: 'database',
34
+ alias: ['h'],
35
+ },
36
+ },
37
+ };
38
+ // MySQL cli commands
26
39
  const mysqlCli = {
27
40
  service: ':host',
28
41
  description: 'Drops into a MySQL shell on a database service',
@@ -35,6 +48,7 @@ const mysqlCli = {
35
48
  },
36
49
  },
37
50
  };
51
+ // Postgres cli commands
38
52
  const postgresCli = {
39
53
  service: ':host',
40
54
  description: 'Drops into a psql shell on a database service',
@@ -59,13 +73,19 @@ const getDrushUrl = version => `https://github.com/drush-ops/drush/releases/down
59
73
  */
60
74
  exports.getDbTooling = database => {
61
75
  // Make sure we strip out any version number
62
- database = database.split(':')[0];
76
+ db = database.split(':')[0];
77
+ ver = database.split(':')[1];
63
78
  // Choose wisely
64
- if (_.includes(['mysql', 'mariadb'], database)) {
79
+ if (db === 'mysql') {
80
+ return {mysql: mysqlCli};
81
+ } else if (db === 'mariadb' && ver < 10.4) {
82
+ // Use mysql command for MariaDB 10.3.x and below
65
83
  return {mysql: mysqlCli};
66
- } else if (database === 'postgres') {
84
+ } else if (db === 'mariadb') {
85
+ return {mariadb: mariadbCli};
86
+ } else if (db === 'postgres') {
67
87
  return {psql: postgresCli};
68
- } else if (database === 'mongo') {
88
+ } else if (db === 'mongo') {
69
89
  return {mongo: {
70
90
  service: 'database',
71
91
  description: 'Drop into the mongo shell',
package/netlify.toml CHANGED
@@ -45,5 +45,11 @@
45
45
  from = "/plugins/drupal/*"
46
46
  to = "/:splat"
47
47
  status = 200
48
-
49
-
48
+ [[redirects]]
49
+ from = "/legacy-versions.html"
50
+ to = "/plugins/drupal/legacy/drupal-8.html"
51
+ status = 302
52
+ [[redirects]]
53
+ from = "/plugins/drupal/drupal-multisite.html"
54
+ to = "/plugins/drupal/guides/drupal-multisite.html"
55
+ status = 302
@@ -1,3 +1,11 @@
1
+ ## v1.3.0 - [April 11, 2024](https://github.com/lando/mariadb/releases/tag/v1.3.0)
2
+
3
+ * Updated available version of Mariadb to 11.3. [#53](https://github.com/lando/mariadb/pull/53)
4
+
5
+ ## v1.2.0 - [March 19, 2024](https://github.com/lando/mariadb/releases/tag/v1.2.0)
6
+
7
+ * Updated available version of Mariadb. [#45](https://github.com/lando/mariadb/pull/45)
8
+
1
9
  ## v1.1.0 - [March 8, 2024](https://github.com/lando/mariadb/releases/tag/v1.1.0)
2
10
 
3
11
  ### Fixes
@@ -33,6 +33,12 @@ If you'd like to report a bug or submit a feature request then please [use the i
33
33
 
34
34
  We try to log all changes big and small in both [THE CHANGELOG](https://github.com/lando/mariadb/blob/main/CHANGELOG.md) and the [release notes](https://github.com/lando/mariadb/releases).
35
35
 
36
+
37
+ ## Maintainers
38
+
39
+ * [@pirog](https://github.com/pirog)
40
+ * [@reynoldsalec](https://github.com/reynoldsalec)
41
+
36
42
  ## Contributors
37
43
 
38
44
  <a href="https://github.com/lando/mariadb/graphs/contributors">
@@ -9,9 +9,19 @@ module.exports = {
9
9
  name: 'mariadb',
10
10
  config: {
11
11
  version: '10.3',
12
- supported: ['10.6', '10.5', '10.4', '10.3', '10.2', '10.1'],
13
- legacy: ['10.1'],
12
+ supported: ['11.3', '11.2', '11.1', '11.0', '10.11', '10.10', '10.9',
13
+ '10.8', '10.7', '10.6', '10.5', '10.4', '10.3', '10.2', '10.1'],
14
+ legacy: ['10.10', '10.9', '10.8', '10.7', '10.3', '10.2', '10.1'],
14
15
  pinPairs: {
16
+ '11.3': 'bitnami/mariadb:11.3.2-debian-12-r1',
17
+ '11.2': 'bitnami/mariadb:11.2.3-debian-12-r4',
18
+ '11.1': 'bitnami/mariadb:11.1.4-debian-12-r4',
19
+ '11.0': 'bitnami/mariadb:11.0.5-debian-12-r5',
20
+ '10.11': 'bitnami/mariadb:10.11.7-debian-12-r6',
21
+ '10.10': 'bitnami/mariadb:10.10.7-debian-11-r6',
22
+ '10.9': 'bitnami/mariadb:10.9.8-debian-11-r22',
23
+ '10.8': 'bitnami/mariadb:10.8.8-debian-11-r5',
24
+ '10.7': 'bitnami/mariadb:10.7.8-debian-11-r6',
15
25
  '10.6': 'bitnami/mariadb:10.6.5-debian-10-r30',
16
26
  '10.5': 'bitnami/mariadb:10.5.8-debian-10-r74',
17
27
  '10.4': 'bitnami/mariadb:10.4.17-debian-10-r84',
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@lando/mariadb",
3
3
  "description": "A Lando plugin that provides a tight integration with mariadb.",
4
- "version": "1.1.0",
4
+ "version": "1.3.0",
5
5
  "author": "Mike Pirog @pirog",
6
6
  "license": "GPL-3.0",
7
7
  "repository": "lando/mariadb",
@@ -46,8 +46,8 @@
46
46
  },
47
47
  "devDependencies": {
48
48
  "@babel/eslint-parser": "^7.16.0",
49
- "@lando/leia": "^0.6.5",
50
- "@lando/vitepress-theme-default-plus": "^1.0.0-beta.40",
49
+ "@lando/leia": "^1.0.0-beta.3",
50
+ "@lando/vitepress-theme-default-plus": "^1.0.1",
51
51
  "chai": "^4.3.4",
52
52
  "command-line-test": "^1.0.10",
53
53
  "eslint": "^7.32.0",
@@ -61,9 +61,9 @@
61
61
  "lodash"
62
62
  ],
63
63
  "dist": {
64
- "integrity": "sha512-WfVKHB9WNfAnYmcUtvHD1mnEtzTrJPnC8IxxXD7bXlGHzCg0fTDMCDq/E4KULzPv3gzSv/Y/qVckwk6PBHrTPQ==",
65
- "shasum": "3e46a4aa9c131181ed9fbe403e060c90ef9dff67",
66
- "filename": "lando-mariadb-1.1.0.tgz",
67
- "unpackedSize": 1469176
64
+ "integrity": "sha512-KS+XSsRaPbNKzzIqFgWeqzrZdW1u9687rDNby+ubOXHiIswReyil+lXOkQ6qYIl13kF3zINihEKzlMpWU/e+YQ==",
65
+ "shasum": "ddda15f427edcd3c39c6c0de143c04eda6eb48d9",
66
+ "filename": "lando-mariadb-1.3.0.tgz",
67
+ "unpackedSize": 1470246
68
68
  }
69
69
  }
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@lando/drupal",
3
3
  "description": "A Lando plugin that provides a tight integration with Drupal.",
4
- "version": "1.4.0",
4
+ "version": "1.6.0",
5
5
  "author": "Mike Pirog @pirog",
6
6
  "license": "GPL-3.0",
7
7
  "repository": "lando/drupal",
@@ -42,7 +42,7 @@
42
42
  "test": "npm run lint && npm run test:unit"
43
43
  },
44
44
  "dependencies": {
45
- "@lando/mariadb": "^1.1.0",
45
+ "@lando/mariadb": "^1.3.0",
46
46
  "@lando/mssql": "^1.0.0",
47
47
  "@lando/mysql": "^1.1.0",
48
48
  "@lando/nginx": "^1.0.0",
@@ -53,8 +53,8 @@
53
53
  },
54
54
  "devDependencies": {
55
55
  "@babel/eslint-parser": "^7.16.0",
56
- "@lando/leia": "^0.6.5",
57
- "@lando/vitepress-theme-default-plus": "^1.0.1",
56
+ "@lando/leia": "^1.0.0-beta.3",
57
+ "@lando/vitepress-theme-default-plus": "^1.0.2",
58
58
  "chai": "^4.3.4",
59
59
  "command-line-test": "^1.0.10",
60
60
  "eslint": "^7.32.0",
@@ -76,9 +76,9 @@
76
76
  "semver"
77
77
  ],
78
78
  "dist": {
79
- "integrity": "sha512-ca5dNigFeNYWHgItkIFDJ2HowfzM8cnwDp2SQufnherOPWk4ykEQtSa4gR9i/BpoWiaApa4X8LEtuimVYzW71A==",
80
- "shasum": "37e70f681cd4417a9a9cf7b231bb14eaee086a5d",
81
- "filename": "lando-drupal-1.4.0.tgz",
82
- "unpackedSize": 12370100
79
+ "integrity": "sha512-O90bibksiHZvqQ+ZazYP6H/iXRW70tShgNCTatNXqrIigRKqYYA9JhMVLV/zYh0vYP78WUoj4z6AkEJn4qXzAw==",
80
+ "shasum": "5a99ac444b9d2ea121920a72ee49a13100ebdb6f",
81
+ "filename": "lando-drupal-1.6.0.tgz",
82
+ "unpackedSize": 12388757
83
83
  }
84
84
  }
@@ -1 +0,0 @@
1
- {"/home/runner/work/drupal/drupal/lib/utils.js":{"path":"/home/runner/work/drupal/drupal/lib/utils.js","statementMap":{"0":{"start":{"line":4,"column":10},"end":{"line":4,"column":27}},"1":{"start":{"line":5,"column":13},"end":{"line":5,"column":28}},"2":{"start":{"line":11,"column":0},"end":{"line":23,"column":2}},"3":{"start":{"line":13,"column":2},"end":{"line":13,"column":41}},"4":{"start":{"line":13,"column":25},"end":{"line":13,"column":41}},"5":{"start":{"line":15,"column":22},"end":{"line":20,"column":3}},"6":{"start":{"line":22,"column":2},"end":{"line":22,"column":63}},"7":{"start":{"line":22,"column":35},"end":{"line":22,"column":48}},"8":{"start":{"line":26,"column":17},"end":{"line":37,"column":1}},"9":{"start":{"line":38,"column":20},"end":{"line":50,"column":1}},"10":{"start":{"line":55,"column":20},"end":{"line":55,"column":107}},"11":{"start":{"line":55,"column":31},"end":{"line":55,"column":107}},"12":{"start":{"line":60,"column":0},"end":{"line":74,"column":2}},"13":{"start":{"line":62,"column":2},"end":{"line":62,"column":36}},"14":{"start":{"line":64,"column":2},"end":{"line":73,"column":3}},"15":{"start":{"line":65,"column":4},"end":{"line":65,"column":29}},"16":{"start":{"line":66,"column":9},"end":{"line":73,"column":3}},"17":{"start":{"line":67,"column":4},"end":{"line":67,"column":31}},"18":{"start":{"line":68,"column":9},"end":{"line":73,"column":3}},"19":{"start":{"line":69,"column":4},"end":{"line":72,"column":7}},"20":{"start":{"line":79,"column":0},"end":{"line":84,"column":2}},"21":{"start":{"line":79,"column":40},"end":{"line":84,"column":1}},"22":{"start":{"line":90,"column":0},"end":{"line":102,"column":2}},"23":{"start":{"line":92,"column":2},"end":{"line":92,"column":41}},"24":{"start":{"line":92,"column":25},"end":{"line":92,"column":41}},"25":{"start":{"line":94,"column":22},"end":{"line":99,"column":3}},"26":{"start":{"line":101,"column":2},"end":{"line":101,"column":63}},"27":{"start":{"line":101,"column":35},"end":{"line":101,"column":48}},"28":{"start":{"line":107,"column":0},"end":{"line":119,"column":2}},"29":{"start":{"line":108,"column":17},"end":{"line":108,"column":19}},"30":{"start":{"line":109,"column":2},"end":{"line":117,"column":5}},"31":{"start":{"line":110,"column":4},"end":{"line":116,"column":5}},"32":{"start":{"line":111,"column":6},"end":{"line":111,"column":42}},"33":{"start":{"line":112,"column":11},"end":{"line":116,"column":5}},"34":{"start":{"line":113,"column":6},"end":{"line":115,"column":7}},"35":{"start":{"line":114,"column":8},"end":{"line":114,"column":79}},"36":{"start":{"line":118,"column":2},"end":{"line":118,"column":16}},"37":{"start":{"line":124,"column":0},"end":{"line":133,"column":3}},"38":{"start":{"line":124,"column":39},"end":{"line":133,"column":2}}},"fnMap":{"0":{"name":"(anonymous_0)","decl":{"start":{"line":11,"column":18},"end":{"line":11,"column":19}},"loc":{"start":{"line":11,"column":54},"end":{"line":23,"column":1}},"line":11},"1":{"name":"(anonymous_1)","decl":{"start":{"line":22,"column":28},"end":{"line":22,"column":29}},"loc":{"start":{"line":22,"column":35},"end":{"line":22,"column":48}},"line":22},"2":{"name":"(anonymous_2)","decl":{"start":{"line":55,"column":20},"end":{"line":55,"column":21}},"loc":{"start":{"line":55,"column":31},"end":{"line":55,"column":107}},"line":55},"3":{"name":"(anonymous_3)","decl":{"start":{"line":60,"column":23},"end":{"line":60,"column":24}},"loc":{"start":{"line":60,"column":35},"end":{"line":74,"column":1}},"line":60},"4":{"name":"(anonymous_4)","decl":{"start":{"line":79,"column":19},"end":{"line":79,"column":20}},"loc":{"start":{"line":79,"column":40},"end":{"line":84,"column":1}},"line":79},"5":{"name":"(anonymous_5)","decl":{"start":{"line":90,"column":18},"end":{"line":90,"column":19}},"loc":{"start":{"line":90,"column":54},"end":{"line":102,"column":1}},"line":90},"6":{"name":"(anonymous_6)","decl":{"start":{"line":101,"column":28},"end":{"line":101,"column":29}},"loc":{"start":{"line":101,"column":35},"end":{"line":101,"column":48}},"line":101},"7":{"name":"(anonymous_7)","decl":{"start":{"line":107,"column":27},"end":{"line":107,"column":28}},"loc":{"start":{"line":107,"column":77},"end":{"line":119,"column":1}},"line":107},"8":{"name":"(anonymous_8)","decl":{"start":{"line":109,"column":19},"end":{"line":109,"column":20}},"loc":{"start":{"line":109,"column":27},"end":{"line":117,"column":3}},"line":109},"9":{"name":"(anonymous_9)","decl":{"start":{"line":124,"column":22},"end":{"line":124,"column":23}},"loc":{"start":{"line":124,"column":39},"end":{"line":133,"column":2}},"line":124}},"branchMap":{"0":{"loc":{"start":{"line":11,"column":35},"end":{"line":11,"column":49}},"type":"default-arg","locations":[{"start":{"line":11,"column":43},"end":{"line":11,"column":49}}],"line":11},"1":{"loc":{"start":{"line":13,"column":2},"end":{"line":13,"column":41}},"type":"if","locations":[{"start":{"line":13,"column":2},"end":{"line":13,"column":41}},{"start":{"line":13,"column":2},"end":{"line":13,"column":41}}],"line":13},"2":{"loc":{"start":{"line":64,"column":2},"end":{"line":73,"column":3}},"type":"if","locations":[{"start":{"line":64,"column":2},"end":{"line":73,"column":3}},{"start":{"line":64,"column":2},"end":{"line":73,"column":3}}],"line":64},"3":{"loc":{"start":{"line":66,"column":9},"end":{"line":73,"column":3}},"type":"if","locations":[{"start":{"line":66,"column":9},"end":{"line":73,"column":3}},{"start":{"line":66,"column":9},"end":{"line":73,"column":3}}],"line":66},"4":{"loc":{"start":{"line":68,"column":9},"end":{"line":73,"column":3}},"type":"if","locations":[{"start":{"line":68,"column":9},"end":{"line":73,"column":3}},{"start":{"line":68,"column":9},"end":{"line":73,"column":3}}],"line":68},"5":{"loc":{"start":{"line":90,"column":35},"end":{"line":90,"column":49}},"type":"default-arg","locations":[{"start":{"line":90,"column":43},"end":{"line":90,"column":49}}],"line":90},"6":{"loc":{"start":{"line":92,"column":2},"end":{"line":92,"column":41}},"type":"if","locations":[{"start":{"line":92,"column":2},"end":{"line":92,"column":41}},{"start":{"line":92,"column":2},"end":{"line":92,"column":41}}],"line":92},"7":{"loc":{"start":{"line":107,"column":37},"end":{"line":107,"column":72}},"type":"default-arg","locations":[{"start":{"line":107,"column":45},"end":{"line":107,"column":72}}],"line":107},"8":{"loc":{"start":{"line":110,"column":4},"end":{"line":116,"column":5}},"type":"if","locations":[{"start":{"line":110,"column":4},"end":{"line":116,"column":5}},{"start":{"line":110,"column":4},"end":{"line":116,"column":5}}],"line":110},"9":{"loc":{"start":{"line":112,"column":11},"end":{"line":116,"column":5}},"type":"if","locations":[{"start":{"line":112,"column":11},"end":{"line":116,"column":5}},{"start":{"line":112,"column":11},"end":{"line":116,"column":5}}],"line":112},"10":{"loc":{"start":{"line":112,"column":15},"end":{"line":112,"column":90}},"type":"binary-expr","locations":[{"start":{"line":112,"column":15},"end":{"line":112,"column":48}},{"start":{"line":112,"column":52},"end":{"line":112,"column":90}}],"line":112},"11":{"loc":{"start":{"line":113,"column":6},"end":{"line":115,"column":7}},"type":"if","locations":[{"start":{"line":113,"column":6},"end":{"line":115,"column":7}},{"start":{"line":113,"column":6},"end":{"line":115,"column":7}}],"line":113}},"s":{"0":0,"1":0,"2":0,"3":0,"4":0,"5":0,"6":0,"7":0,"8":0,"9":0,"10":0,"11":0,"12":0,"13":0,"14":0,"15":0,"16":0,"17":0,"18":0,"19":0,"20":0,"21":0,"22":0,"23":0,"24":0,"25":0,"26":0,"27":0,"28":0,"29":0,"30":0,"31":0,"32":0,"33":0,"34":0,"35":0,"36":0,"37":0,"38":0},"f":{"0":0,"1":0,"2":0,"3":0,"4":0,"5":0,"6":0,"7":0,"8":0,"9":0},"b":{"0":[0],"1":[0,0],"2":[0,0],"3":[0,0],"4":[0,0],"5":[0],"6":[0,0],"7":[0],"8":[0,0],"9":[0,0],"10":[0,0],"11":[0,0]},"all":true},"/home/runner/work/drupal/drupal/lib/warnings.js":{"path":"/home/runner/work/drupal/drupal/lib/warnings.js","statementMap":{"0":{"start":{"line":5,"column":0},"end":{"line":13,"column":3}},"1":{"start":{"line":5,"column":32},"end":{"line":13,"column":1}}},"fnMap":{"0":{"name":"(anonymous_0)","decl":{"start":{"line":5,"column":20},"end":{"line":5,"column":21}},"loc":{"start":{"line":5,"column":32},"end":{"line":13,"column":1}},"line":5}},"branchMap":{},"s":{"0":0,"1":0},"f":{"0":0},"b":{},"all":true}}
@@ -1 +0,0 @@
1
- {"parent":null,"pid":1835,"argv":["/opt/hostedtoolcache/node/18.20.2/x64/bin/node","/home/runner/work/drupal/drupal/node_modules/.bin/nyc","--reporter=html","--reporter=text","mocha","--timeout","5000","test/**/*.spec.js"],"execArgv":[],"cwd":"/home/runner/work/drupal/drupal","time":1713289108916,"ppid":1834,"coverageFilename":"/home/runner/work/drupal/drupal/.nyc_output/6263b5b0-dc1a-4c4a-a3df-dcd91408d89e.json","externalId":"","uuid":"6263b5b0-dc1a-4c4a-a3df-dcd91408d89e","files":["/home/runner/work/drupal/drupal/lib/utils.js","/home/runner/work/drupal/drupal/lib/warnings.js"]}
@@ -1 +0,0 @@
1
- {"parent":null,"pid":1846,"argv":["/opt/hostedtoolcache/node/18.20.2/x64/bin/node","/home/runner/work/drupal/drupal/node_modules/.bin/mocha","--timeout","5000","test/**/*.spec.js"],"execArgv":[],"cwd":"/home/runner/work/drupal/drupal","time":1713289109343,"ppid":1835,"coverageFilename":"/home/runner/work/drupal/drupal/.nyc_output/e55d54a9-a2cd-4da5-8d02-66aebb969d98.json","externalId":"","uuid":"e55d54a9-a2cd-4da5-8d02-66aebb969d98","files":[]}