Skip to content

Commit

Permalink
#15: Address PR comments to update docs and make sure Solr8 config d…
Browse files Browse the repository at this point in the history
…oesn't bleed in to Solr3.
  • Loading branch information
reynoldsalec committed Dec 7, 2022
1 parent 28a7163 commit 3665f9e
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 3 deletions.
4 changes: 2 additions & 2 deletions docs/config.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@ If you do not already have a [Landofile](https://docs.lando.dev/config/lando.htm

Note that if the above config options are not enough, all Lando recipes can be further [extended and overriden](https://docs.lando.dev/config/recipes.html#extending-and-overriding-recipes).

## Choosing PHP/database/Solr versions
## Choosing service versions

Lando will look for a [`pantheon.yml`](https://pantheon.io/docs/pantheon-yml/) (and/or `pantheon.upstream.yml`) in your app's root directory and use the values you've set for `php_version`, `database`, and `search` you've specified there.

This means that **you can not configure the php version directly in your Landofile for this recipe.**
This means that **you can not configure php, mysql, or solr versions directly in your Landofile for this recipe.**

If you change this version, make sure you [`lando rebuild`](https://docs.lando.dev/cli/rebuild.html) for the changes to apply.

Expand Down
6 changes: 5 additions & 1 deletion recipes/pantheon/builder.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,11 @@ const overrideAppserver = options => {
options.services.appserver.overrides.environment = utils.getPantheonEnvironment(options);

// Override the Solr8 service.
options.services.index.overrides.volumes.push(`${options.confDest}/jetty.xml:/opt/solr-8.11.2/server/etc/jetty.xml`);
if (options.solrTag === '8') {
options.services.index.overrides.volumes
.push(`${options.confDest}/jetty.xml:/opt/solr-8.11.2/server/etc/jetty.xml`);
}

return options;
};

Expand Down

0 comments on commit 3665f9e

Please sign in to comment.