Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix cert problem #263

Closed
wants to merge 6 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build-pantheon-images.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:

jobs:
buildx:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
env:
TERM: xterm
strategy:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr-docs-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
strategy:
matrix:
os:
- ubuntu-22.04
- ubuntu-24.04
node-version:
- '18'
steps:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/pr-drupal10-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ jobs:
leia-test:
- examples/drupal10
lando-version:
- 3-dev-slim
- 3-edge-slim
os:
- ubuntu-22.04
- ubuntu-24.04
node-version:
- '18'

Expand All @@ -38,7 +38,7 @@ jobs:
version: dev
sync: false
- name: Setup lando ${{ matrix.lando-version }}
uses: lando/setup-lando@v2
uses: lando/setup-lando@v3
with:
lando-version: ${{ matrix.lando-version }}
config: |
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/pr-drupal7-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ jobs:
leia-test:
- examples/drupal7
lando-version:
- 3-dev-slim
- 3-edge-slim
os:
- ubuntu-22.04
- ubuntu-24.04
node-version:
- '18'

Expand All @@ -38,7 +38,7 @@ jobs:
version: dev
sync: false
- name: Setup lando ${{ matrix.lando-version }}
uses: lando/setup-lando@v2
uses: lando/setup-lando@v3
with:
lando-version: ${{ matrix.lando-version }}
config: |
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/pr-drupal8-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ jobs:
leia-test:
- examples/drupal8
lando-version:
- 3-dev-slim
- 3-edge-slim
os:
- ubuntu-22.04
- ubuntu-24.04
node-version:
- '18'

Expand All @@ -38,7 +38,7 @@ jobs:
version: dev
sync: false
- name: Setup lando ${{ matrix.lando-version }}
uses: lando/setup-lando@v2
uses: lando/setup-lando@v3
with:
lando-version: ${{ matrix.lando-version }}
config: |
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/pr-drupal9-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ jobs:
leia-test:
- examples/drupal9
lando-version:
- 3-dev-slim
- 3-edge-slim
os:
- ubuntu-22.04
- ubuntu-24.04
node-version:
- '18'

Expand All @@ -38,7 +38,7 @@ jobs:
version: dev
sync: false
- name: Setup lando ${{ matrix.lando-version }}
uses: lando/setup-lando@v2
uses: lando/setup-lando@v3
with:
lando-version: ${{ matrix.lando-version }}
config: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr-linter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
strategy:
matrix:
os:
- ubuntu-22.04
- ubuntu-24.04
node-version:
- '18'
steps:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/pr-pantheon-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ jobs:
- examples/pantheon-downstreamer-1
- examples/pantheon-downstreamer-2
lando-version:
- 3-dev-slim
- 3-edge-slim
os:
- ubuntu-22.04
- ubuntu-24.04
node-version:
- '18'

Expand All @@ -40,7 +40,7 @@ jobs:
version: dev
sync: false
- name: Setup lando ${{ matrix.lando-version }}
uses: lando/setup-lando@v2
uses: lando/setup-lando@v3
with:
lando-version: ${{ matrix.lando-version }}
config: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr-unit-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
matrix:
os:
- windows-2022
- ubuntu-22.04
- ubuntu-24.04
- macos-12
node-version:
- '18'
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/pr-wordpress-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ jobs:
leia-test:
- examples/wordpress
lando-version:
- 3-dev-slim
- 3-edge-slim
os:
- ubuntu-22.04
- ubuntu-24.04
node-version:
- '18'

Expand All @@ -38,7 +38,7 @@ jobs:
version: dev
sync: false
- name: Setup lando ${{ matrix.lando-version }}
uses: lando/setup-lando@v2
uses: lando/setup-lando@v3
with:
lando-version: ${{ matrix.lando-version }}
config: |
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/pr-wordpressnetworkdomain-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ jobs:
leia-test:
- examples/wordpressnetworkdomain
lando-version:
- 3-dev-slim
- 3-edge-slim
os:
- ubuntu-22.04
- ubuntu-24.04
node-version:
- '18'

Expand All @@ -38,7 +38,7 @@ jobs:
version: dev
sync: false
- name: Setup lando ${{ matrix.lando-version }}
uses: lando/setup-lando@v2
uses: lando/setup-lando@v3
with:
lando-version: ${{ matrix.lando-version }}
config: |
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/pr-wordpressnetworkfolder.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ jobs:
leia-test:
- examples/wordpressnetworkfolder
lando-version:
- 3-dev-slim
- 3-edge-slim
os:
- ubuntu-22.04
- ubuntu-24.04
node-version:
- '18'

Expand All @@ -38,15 +38,15 @@ jobs:
version: dev
sync: false
- name: Setup lando ${{ matrix.lando-version }}
uses: lando/setup-lando@v2
uses: lando/setup-lando@v3
with:
lando-version: ${{ matrix.lando-version }}
config: |
setup.skipCommonPlugins=true
setup.plugins.@lando/pantheon=/home/runner/work/pantheon/pantheon
telemetry: false
- name: Setup lando ${{ matrix.lando-version }}
uses: lando/setup-lando@v2
uses: lando/setup-lando@v3
with:
lando-version: ${{ matrix.lando-version }}
config: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
strategy:
matrix:
os:
- ubuntu-22.04
- ubuntu-24.04
node-version:
- '18'
steps:
Expand Down
31 changes: 16 additions & 15 deletions .lando.yml
Original file line number Diff line number Diff line change
@@ -1,23 +1,24 @@
name: lando-pantheon-plugin
name: docs.pantheon
proxy:
cli:
- docs.pantheon.lndo.site:5173
services:
cli:
api: 3
type: lando
services:
image: node:18
command: sleep infinity
working_dir: /app
ports:
- 8080:8080
build:
- npm install
api: 4
image: node:18
command: sleep infinity
ports:
- 5173:5173/http
scanner: false
ssl: false
sslExpose: false
user: node
build:
app: |
npm install
tooling:
node:
service: cli
vuepress:
service: cli
npm:
service: cli
vitepress:
service: cli
cmd: npx vitepress
2 changes: 1 addition & 1 deletion docs/getting-started.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Before you get started with this recipe, we assume that you have:

1. [Installed Lando](https://docs.lando.dev/getting-started/installation.html) and gotten familiar with [its basics](https://docs.lando.dev/cli/).
2. [Initialized](https://docs.lando.dev/cli/init.html) a [Landofile](https://docs.lando.dev/core/v3) for your codebase for use with this recipe.
3. Read about the various [services](https://docs.lando.dev/core/v3/lando-service.html), [tooling](https://docs.lando.dev/core/v3/tooling.html), [events](https://docs.lando.dev/core/v3/events.html) and [routing](https://docs.lando.dev/core/v3/proxy.html) Lando offers.
3. Read about the various [services](https://docs.lando.dev/core/v3/services/lando.html), [tooling](https://docs.lando.dev/core/v3/tooling.html), [events](https://docs.lando.dev/core/v3/events.html) and [routing](https://docs.lando.dev/core/v3/proxy.html) Lando offers.

## Quick Start

Expand Down
2 changes: 1 addition & 1 deletion docs/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Lando provides a snazzy integration that:
* Allows you to easily `push` your changes back to Pantheon
* Installs `drush`, `terminus` and other power tools.

However, in order to profit, **you must** have an account and a site on Pantheon to be able to use this recipe. If you don't, you can sign up [here](https://pantheon.io/register).
However, in order to profit, **you must** have an account and a site on Pantheon to be able to use this recipe. If you don't, you can sign up [here](https://pantheon.auth0.com/u/login/identifier).

You should also check out Pantheon's [local dev](https://docs.pantheon.io/guides/local-development/) docs.

Expand Down
2 changes: 1 addition & 1 deletion examples/drupal8/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ lando poweroff
# Should initialize the lando pantheon test drupal8 site
rm -rf drupal8 && mkdir -p drupal8 && cd drupal8
cp ../../.lando.upstream.yml .lando.upstream.yml
lando init --source pantheon --pantheon-auth "$PANTHEON_MACHINE_TOKEN" --pantheon-site landobot-drupal8 --option composer_version=1.10.1
lando init --source pantheon --pantheon-auth "$PANTHEON_MACHINE_TOKEN" --pantheon-site landobot-drupal8 --option composer_version=2

# Should start up our drupal8 site successfully
cd drupal8
Expand Down
3 changes: 0 additions & 3 deletions scripts/pantheon.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,13 @@ LANDO_MODULE="pantheon"
# Kick it off
lando_pink "Pantheon pre-run scripting"

/helpers/add-cert.sh --silent

# Set up some new dirs
mkdir -p /var/www/certs
mkdir -p /srv/bindings
chown -R www-data:www-data /var/www/certs /srv/bindings

# Set up some symlnks
ln -sfn /var/www /srv/bindings/lando
ln -sfn /var/www/certs/binding.pem /certs/binding.pem

ln -sfn /tmp /srv/bindings/lando/tmp
ln -sfn /app /srv/bindings/lando/code
Expand Down
Loading