Skip to content

Commit a4afb41

Browse files
authored
Merge branch 'master' into akeneo-3-staging-guide-fixes
2 parents 9ae1307 + 52b680c commit a4afb41

4 files changed

Lines changed: 19 additions & 16 deletions

File tree

.github/workflows/deploy.yaml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: Deploy application
22

33
on:
4-
pull_request:
4+
pull_request_target:
55
push:
66
branches:
77
- 'master'
@@ -17,6 +17,7 @@ jobs:
1717
- uses: actions/checkout@v3
1818
with:
1919
fetch-depth: 0
20+
ref: ${{ github.event.pull_request.head.sha || github.sha }}
2021
# Declares the repository safe and not under dubious ownership.
2122
- name: Add repository to git safe directories
2223
run: git config --global --add safe.directory $GITHUB_WORKSPACE
@@ -46,12 +47,13 @@ jobs:
4647
environment:
4748
name: acceptance
4849
url: ${{ steps.get_brancher_hostname.outputs.BRANCHER_URL }}
49-
if: github.ref != 'refs/heads/master'
50+
if: github.event_name == 'pull_request_target'
5051
container: quay.io/hypernode/deploy:latest-php8.4-node22
5152
steps:
5253
- uses: actions/checkout@v3
5354
with:
5455
fetch-depth: 0
56+
ref: ${{ github.event.pull_request.head.sha || github.sha }}
5557
- name: download build artifact
5658
uses: actions/download-artifact@v4
5759
with:
@@ -101,7 +103,7 @@ jobs:
101103
environment:
102104
name: production
103105
url: https://docs.hypernode.io
104-
if: github.ref == 'refs/heads/master'
106+
if: github.event_name == 'push' && github.ref == 'refs/heads/master'
105107
container: quay.io/hypernode/deploy:latest-php8.4-node22
106108
steps:
107109
- uses: actions/checkout@v3

.github/workflows/lint.yaml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: Run linting and suggest changes
22

33
on:
4-
pull_request:
4+
pull_request_target:
55

66
permissions:
77
contents: read
@@ -15,8 +15,10 @@ jobs:
1515
python-version: ['3.12']
1616

1717
steps:
18-
- uses: actions/checkout@v3
19-
- uses: actions/setup-python@v4
18+
- uses: actions/checkout@v4
19+
with:
20+
ref: ${{ github.event.pull_request.head.sha }}
21+
- uses: actions/setup-python@v5
2022
with:
2123
python-version: ${{ matrix.python-version }}
2224
- name: Install dependencies

docs/getting-started/how-to-order/how-to-get-started-with-your-hypernode-trial.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,16 +64,18 @@ In our support documentation you will find detailed information about installing
6464
- [Akeneo 4](../../ecommerce-applications/akeneo/how-to-install-akeneo-4-on-hypernode.md)
6565
- [Akeneo 5](../../ecommerce-applications/akeneo/how-to-install-akeneo-5-on-hypernode.md)
6666
- [Akeneo 6](../../ecommerce-applications/akeneo/how-to-install-akeneo-6-on-hypernode.md)
67+
- [Akeneo 7](../../ecommerce-applications/akeneo/how-to-install-akeneo-7-on-hypernode.md)
6768
- [Magento 1](../../ecommerce-applications/magento-1/how-to-install-magento-1-on-hypernode.md)
6869
- [Magento 2](../../ecommerce-applications/magento-2/how-to-install-magento-2-on-hypernode.md)
6970
- [Shopware 5](../../ecommerce-applications/shopware-5/how-to-install-shopware-5-on-hypernode.md)
7071
- [Shopware 6](../../ecommerce-applications/shopware-6/how-to-install-shopware-6-on-hypernode.md)
72+
- [WooCommerce](../../ecommerce-applications/woocommerce/how-to-install-woocommerce-on-hypernode.md)
7173

7274
### Step 4 – Set up Hypernode Managed Vhosts
7375

7476
Due to this configuration it is required to add a new vhost for every domain you want to link to your Hypernode. So you need to configure your DNS correctly and add a new vhost for the domain.
7577

76-
To add a new vhost, for example the domainname [www.example.com](http://www.example.com), to your configuration, you can simply run the command `hypernode-manage-vhosts www.example.com`. This will create a new vhost configuration in `/data/web/nginx/www.example.com/`, using the Magento 2 template.
78+
To add a new vhost, for example the domain name [www.example.com](http://www.example.com), to your configuration, you can simply run the command `hypernode-manage-vhosts www.example.com`. This will create a new vhost configuration in `/data/web/nginx/www.example.com/`, using the Magento 2 template.
7779

7880
Please note that defining the vhosts '[www.example.com](http://www.example.com)', does not automatically add 'example.com' as a vhost. You will have to manually define a vhost for this. Since most people simply want their 'example.com' to redirect to '[www.example.com](http://www.example.com)', you can simply use the `--type wwwizer` argument to set this up. This will configure the vhost to redirect all traffic to the www-version of the domain.
7981

docs/getting-started/how-to-order/how-to-order-a-domain.md

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,11 @@
1-
______________________________________________________________________
2-
1+
---
32
myst:
4-
html_meta:
5-
description: 'Find out here how to order a domain.'
3+
html_meta:
4+
description: Find out here how to order a domain.
65
redirect_from:
7-
8-
- /en/getting-started/how-to-order/how-to-order-a-domain-presence-plan/
9-
- /getting-started/how-to-order/how-to-order-a-domain-presence-plan.html
10-
11-
______________________________________________________________________
6+
- /en/getting-started/how-to-order/how-to-order-a-domain-presence-plan/
7+
- /getting-started/how-to-order/how-to-order-a-domain-presence-plan.html
8+
---
129

1310
<!-- source: https://support.hypernode.com/en/getting-started/how-to-order/how-to-order-a-domain-presence-plan/ -->
1411

0 commit comments

Comments
 (0)