Merge branch 'main' into dependabot/npm_and_yarn/vite-5.2.8

.github/workflows/label-add-to-project.yml

@@ -0,0 +1,19 @@
+name: Add to Contrib Project
+
+on:
+  issues:
+    types: [labeled]
+  pull_request:
+    types: [labeled]
+
+jobs:
+  add_to_project:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Add issue/PR to GitHub Project
+        if: github.event.label.name == 'flag'
+        uses: actions/add-to-project@v1.0.0
+        with:
+          project-url: https://github.com/orgs/lando/projects/7
+          github-token: ${{ secrets.SHADOW_COUNCIL_ESCALATOR }}
+          labeled: flag

builders/php.js

@@ -125,6 +125,7 @@ module.exports = {
       _php: '/usr/local/etc/php/conf.d/xxx-lando-default.ini',
       vhosts: '/etc/apache2/sites-enabled/000-default.conf',
       php: '/usr/local/etc/php/conf.d/zzz-lando-my-custom.ini',
+      pool: '/usr/local/etc/php-fpm.d/zz-lando.conf',
     },
     sources: [],
     suffix: '4',
@@ -140,7 +141,7 @@ module.exports = {
       options = parseConfig(_.merge({}, config, options));
       // Mount our default php config
       options.volumes.push(`${options.confDest}/${options.defaultFiles._php}:${options.remoteFiles._php}`);
-
+      options.volumes.push(`${options.confDest}/${options.defaultFiles.pool}:${options.remoteFiles.pool}`);
       // Shift on the docker entrypoint if this is a more recent version
       if (options.version !== 'custom' && semver.gt(semver.coerce(options.version), '5.5.0')) {
         options.command.unshift('docker-php-entrypoint');

examples/custom/.lando.yml

@@ -15,6 +15,7 @@ services:
     webroot: web
     config:
       php: config/php.ini
+      pool: config/www.conf
     composer_version: '2.1.14'
     overrides:
       image: devwithlando/php:8.1-fpm-4
@@ -31,4 +32,4 @@ tooling:
 # This is important because it lets lando know to test against the plugin in this repo
 # DO NOT REMOVE THIS!
 plugins:
-  "@lando/php": ./../../
+  "@lando/php": ./../../

examples/custom/README.md

@@ -53,6 +53,9 @@ lando ssh -s custom81_nginx -c "curl https://localhost" | grep "WEBDIR"
 # Should use custom php ini if specified
 lando ssh -s custom81 -c "php -i | grep memory_limit | grep 514"
 lando ssh -s custom81 -c "curl http://custom81_nginx" | grep html_errors | grep On | grep On
+
+# Detect whether php-fpm is using custom www.conf
+lando ssh -s custom81 -c "php -i | grep start_servers | grep 2"
 ```
 
 Destroy tests

examples/custom/config/www.conf

@@ -0,0 +1,8 @@
+; Override default PHP-FPM settings.
+[www]
+
+pm.max_children = 5
+pm.start_servers = 2
+pm.min_spare_servers = 1
+pm.max_spare_servers = 3
+pm.max_requests = 500

package.json

@@ -49,7 +49,7 @@
   "devDependencies": {
     "@babel/eslint-parser": "^7.16.0",
     "@lando/leia": "0.6.5",
-    "@lando/vitepress-theme-default-plus": "^1.0.0-beta.42",
+    "@lando/vitepress-theme-default-plus": "^1.0.1",
     "chai": "^4.3.4",
     "command-line-test": "^1.0.10",
     "eslint": "^7.32.0",