Skip to content

Commit 9c32049

Browse files
committed
Merge branch 'main' into nap-release-plm
2 parents e9bec43 + 0158f5d commit 9c32049

37 files changed

+686
-1891
lines changed

.github/workflows/build-push.yml

Lines changed: 1 addition & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -115,51 +115,4 @@ jobs:
115115
}
116116
env:
117117
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL_FRIENDS_OF_DOCS }}
118-
PREVIEW_URL: ${{ needs.call-docs-build-push.outputs.PREVIEW_URL }}
119-
120-
121-
lighthouseci:
122-
if: github.event.pull_request
123-
needs: call-docs-build-push
124-
runs-on: ubuntu-22.04
125-
steps:
126-
- uses: actions/checkout@v5
127-
with:
128-
ref: ${{ github.event.workflow_run.head_branch }}
129-
- uses: actions/setup-node@v5
130-
with:
131-
node-version: 18
132-
- name: Installing packages
133-
run: npm install
134-
- name: Generating lighthouse reports for PR and main...
135-
run: |
136-
node lighthouse-script.js
137-
- name: Compare the artifacts for negative differences in performance
138-
continue-on-error: true
139-
run: |
140-
FIELDS=("performance" "accessibility")
141-
for FIELD in "${FIELDS[@]}"; do
142-
PR_VALUE=$(cat lighthouse-reports/pr-report.json | jq -r ".categories.$FIELD.score")
143-
MAIN_VALUE=$(cat lighthouse-reports/main-report.json | jq -r ".categories.$FIELD.score")
144-
echo "$FIELD: PR - $PR_VALUE | Main - $MAIN_VALUE"
145-
146-
if [ $FIELD = "performance" ]; then
147-
LOWER_BOUND=$(echo "$MAIN_VALUE - 0.05" | bc)
148-
UPPER_BOUND=$(echo "$MAIN_VALUE + 0.05" | bc)
149-
if (( $(echo "$PR_VALUE < $LOWER_BOUND" | bc -l) || $(echo "$PR_VALUE > $UPPER_BOUND" | bc -l) )); then
150-
echo "Error: $FIELD score in PR ($PR_VALUE) is less than in MAIN ($MAIN_VALUE)"
151-
exit 1
152-
fi
153-
else
154-
if (( $(echo "$PR_VALUE < $MAIN_VALUE" | bc -l) )); then
155-
echo "Error: $FIELD score in PR ($PR_VALUE) is less than in MAIN ($MAIN_VALUE)"
156-
exit 1
157-
fi
158-
fi
159-
done
160-
- uses: actions/upload-artifact@v4
161-
if: ${{ !cancelled() }}
162-
with:
163-
name: lighthouse-reports
164-
path: lighthouse-reports/
165-
retention-days: 30
118+
PREVIEW_URL: ${{ needs.call-docs-build-push.outputs.PREVIEW_URL }}

.github/workflows/notification.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ on:
55
workflows:
66
- "QE LinkChecker"
77
- "Check for Broken Links"
8+
- "UI validation on prod"
89
types: [completed]
910

1011
permissions:

.github/workflows/playwright.yml

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
name: UI validation on prod
2+
on:
3+
workflow_dispatch:
4+
schedule:
5+
- cron: "0 * * * *"
6+
7+
jobs:
8+
run-playwright-tests:
9+
runs-on: ubuntu-latest
10+
steps:
11+
- uses: actions/checkout@v4
12+
- uses: actions/setup-node@v4
13+
with:
14+
node-version: lts/*
15+
- name: Install dependencies
16+
run: npm ci
17+
- name: Install Playwright Browsers
18+
run: npx playwright install --with-deps
19+
- name: Run Playwright tests
20+
run: npx playwright test --retries=2
21+
- uses: actions/upload-artifact@v4
22+
if: ${{ !cancelled() }}
23+
with:
24+
name: playwright-report
25+
path: tests/playwright-report/
26+
retention-days: 30
27+
- uses: actions/upload-artifact@v4
28+
if: ${{ !cancelled() }}
29+
with:
30+
name: test-results
31+
path: tests/test-results/
32+
retention-days: 30

.gitignore

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,13 @@ resources/
3535
.netlify/plugins/*
3636
.netlify/
3737

38-
# Local Lighthouse artifacts
39-
lighthouse-reports
40-
4138
*.pyc
4239
build
4340
*.swp
4441
*.mo
4542
node_modules
43+
44+
# Playwright
45+
/coverage
46+
*/test-results
47+
*/playwright-report

content/nap-dos/deployment-guide/learn-about-deployment.md

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -413,22 +413,28 @@ When deploying App Protect DoS on NGINX Plus take the following precautions to s
413413
414414
6. Enable Yum repositories to pull NGINX App Protect DoS dependencies:
415415
416-
If you have a RHEL subscription:
416+
For RHEL subscription:
417417
418418
```shell
419419
sudo subscription-manager repos --enable=rhel-8-for-x86_64-baseos-rpms
420420
sudo subscription-manager repos --enable=rhel-8-for-x86_64-appstream-rpms
421421
sudo dnf -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm
422422
```
423423
424-
7. Add NGINX Plus and NGINX App Protect DoS repository:
424+
For RockyLinux:
425+
426+
```shell
427+
sudo dnf -y install epel-release
428+
```
429+
430+
8. Add NGINX Plus and NGINX App Protect DoS repository:
425431
426432
```shell
427433
sudo wget -P /etc/yum.repos.d https://cs.nginx.com/static/files/nginx-plus-8.repo
428434
sudo wget -P /etc/yum.repos.d https://cs.nginx.com/static/files/app-protect-dos-8.repo
429435
```
430436
431-
8. In case of fresh installation, update the repository and install the most recent version of the NGINX Plus App Protect DoS package (which includes NGINX Plus):
437+
9. In case of fresh installation, update the repository and install the most recent version of the NGINX Plus App Protect DoS package (which includes NGINX Plus):
432438
433439
```shell
434440
sudo dnf install app-protect-dos
@@ -457,7 +463,7 @@ When deploying App Protect DoS on NGINX Plus take the following precautions to s
457463
sudo dnf install app-protect-dos-27+2.4.0
458464
```
459465
460-
9. In case of upgrading from previously installed NGINX Plus App Protect DoS package (which includes NGINX Plus):
466+
10. In case of upgrading from previously installed NGINX Plus App Protect DoS package (which includes NGINX Plus):
461467
462468
```shell
463469
sudo dnf remove nginx-plus
@@ -621,14 +627,20 @@ When deploying App Protect DoS on NGINX Plus take the following precautions to s
621627
622628
6. Enable the yum repositories to pull NGINX App Protect DoS dependencies:
623629
624-
If you have a RHEL subscription:
630+
For RHEL subscription:
625631
626632
```shell
627633
sudo subscription-manager repos --enable=rhel-9-for-x86_64-baseos-rpms
628634
sudo subscription-manager repos --enable=rhel-9-for-x86_64-appstream-rpms
629635
sudo dnf -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm
630636
```
631637
638+
For RockyLinux:
639+
640+
```shell
641+
sudo dnf -y install epel-release
642+
```
643+
632644
7. Add the NGINX Plus and NGINX App Protect DoS repositories:
633645
634646
```shell

content/nginx/admin-guide/load-balancer/http-health-check.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ NGINX and F5 NGINX Plus can continually test your upstream servers, avoid the se
1818
<span id="prereq"></span>
1919
## Prerequisites
2020

21-
- For passive health checks, [NGINX Open Source](https://nginx.org/en/) or [NGINX Plus](https://www.nginx.com/products/nginx)
21+
- For passive health checks, [NGINX Open Source](https://nginx.org/en/) or [NGINX Plus](https://www.f5.com/products/nginx/nginx-plus)
2222
- For active health checks and the [live activity monitoring dashboard]({{< ref "nginx/admin-guide/monitoring/live-activity-monitoring.md" >}}), NGINX Plus
2323
- A load‑balanced group of [HTTP upstream servers]({{< ref "http-load-balancer.md" >}})
2424

content/nginx/admin-guide/security-controls/configuring-oidc.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ The setup steps are similar for most identity providers, but some details may di
119119

120120
Copy the **issuer** value. You will need it later when [configuring NGINX Plus as the Relying Party](#setup-oidc-provider2).
121121

122-
5. Configure a logout URI - a URI that a user visits to initiate an RP‑initiated logout flow, for example, `https://demo.example.com/post_logout/`. (Optional, supported since [NGINX Plus R35](({{< ref "nginx/releases.md#r35" >}}))).
122+
5. Configure a logout URI - a URI that a user visits to initiate an RP‑initiated logout flow, for example, `https://demo.example.com/post_logout/`. (Optional, supported since [NGINX Plus R35]({{< ref "nginx/releases.md#r35" >}})).
123123

124124

125125
## Configure the Relying Party (NGINX Plus) {#rp-setup}

content/nginx/deployment-guides/load-balance-third-party/apache-tomcat.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -440,7 +440,7 @@ HTTP/2 is fully supported in both <span style="white-space: nowrap;">NGINX Open
440440

441441
- In <span style="white-space: nowrap;">NGINX Plus R8</span> and later, NGINX Plus supports HTTP/2 by default. (Support for SPDY is deprecated as of that release). Specifically:
442442

443-
In <span style="white-space: nowrap;">NGINX Plus R11</span> and later, the {{<nb>}}**nginx-plus**{{</nb>}} package continues to support HTTP/2 by default, but the {{<nb>}}**nginx-plus-extras**{{</nb>}} package available in previous releases is deprecated by [dynamic modules](https://www.nginx.com/products/nginx/dynamic-modules/).
443+
In <span style="white-space: nowrap;">NGINX Plus R11</span> and later, the {{<nb>}}**nginx-plus**{{</nb>}} package continues to support HTTP/2 by default, but the {{<nb>}}**nginx-plus-extras**{{</nb>}} package available in previous releases is deprecated by [dynamic modules](https://www.f5.com/go/product/nginx-modules/).
444444

445445
For <span style="white-space: nowrap;">NGINX Plus R8</span> through R10, the {{<nb>}}**nginx-plus**{{</nb>}} and {{<nb>}}**nginx-plus-extras**{{</nb>}} packages support HTTP/2 by default.
446446

@@ -962,7 +962,7 @@ server {
962962
<span id="resources"></span>
963963
## Resources
964964

965-
- [NGINX Plus Overview](https://www.nginx.com/products/nginx)
965+
- [NGINX Plus Overview](https://www.f5.com/products/nginx/nginx-plus)
966966
- [NGINX Plus Admin Guide]({{< ref "/nginx/admin-guide/_index.md" >}})
967967
- [NGINX Wiki](https://www.nginx.com/resources/wiki/)
968968

content/nginx/deployment-guides/load-balance-third-party/microsoft-exchange.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -615,7 +615,7 @@ HTTP/2 is fully supported in <span style="white-space: nowrap;">NGINX Plus R7</s
615615

616616
In <span style="white-space: nowrap;">NGINX Plus R8</span> and later, NGINX Plus supports HTTP/2 by default, and does not support SPDY:
617617

618-
- In <span style="white-space: nowrap;">NGINX Plus R11</span> and later, the {{<nb>}}**nginx-plus**{{</nb>}} package continues to support HTTP/2 by default, but the {{<nb>}}**nginx-plus-extras**{{</nb>}} package available in previous releases is deprecated by [dynamic modules](https://www.nginx.com/products/nginx/dynamic-modules/).
618+
- In <span style="white-space: nowrap;">NGINX Plus R11</span> and later, the {{<nb>}}**nginx-plus**{{</nb>}} package continues to support HTTP/2 by default, but the {{<nb>}}**nginx-plus-extras**{{</nb>}} package available in previous releases is deprecated by [dynamic modules](https://www.f5.com/go/product/nginx-modules/).
619619

620620
- For <span style="white-space: nowrap;">NGINX Plus R8</span> through R10, the {{<nb>}}**nginx-plus**{{</nb>}} and {{<nb>}}**nginx-plus-extras**{{</nb>}} packages support HTTP/2 by default.
621621

content/nginx/deployment-guides/load-balance-third-party/node-js.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -872,7 +872,7 @@ server {
872872
<span id="resources"></span>
873873
## Resources
874874

875-
- [NGINX Plus Overview](https://www.nginx.com/products/nginx)
875+
- [NGINX Plus Overview](https://www.f5.com/products/nginx/nginx-plus)
876876
- [NGINX Plus Admin Guide]({{< ref "/nginx/admin-guide/_index.md" >}})
877877
- [NGINX Wiki](https://www.nginx.com/resources/wiki/)
878878

0 commit comments

Comments
 (0)