Skip to content

Commit a4e6447

Browse files
authored
Merge branch 'main' into waf/refactor
2 parents 55821ff + 58dab7f commit a4e6447

File tree

7 files changed

+25
-17
lines changed

7 files changed

+25
-17
lines changed

.github/workflows/linkchecker.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,7 @@ env:
3131
--ignore-url ^https://lightstep.com --ignore-url ^https://www.owasp.org/ --ignore-url ^https://www.maxmind.com --ignore-url ^https://www.splunk.com/
3232
--ignore-url ^https://oauth2.googleapis.com --ignore-url ^https://openidconnect.googleapis.com --ignore-url ^https://www.base64url.com/
3333
--ignore-url ^https://go.googlesource.com/ --ignore-url ^https://go.googlesource.com/sync --ignore-url ^https://linkerd.io/2.13/
34-
--ignore-url ^http://www.redirectpage.com/ --ignore-url ^https://www.gnu.org/ --ignore-url ^https://insert_your_tenant_name.console.ves.volterra.io/
35-
--ignore-url ^https://INSERT_YOUR_TENANT_NAME.console.ves.volterra.io
34+
--ignore-url ^http://www.redirectpage.com/ --ignore-url ^https://www.gnu.org/ --ignore-url ^https://insert_your_tenant_name.console.ves.volterra.io
3635
--ignore-url ^https://\([a-zA-Z0-9-]+\).nginx.com/nginx-ingress-controller/css
3736
--ignore-url ^https://\([a-zA-Z0-9-]+\).nginx.com/nginxaas/azure/css
3837
--ignore-url ^https://\([a-zA-Z0-9-]+\).nginx.com/nginx-gateway-fabric/css

content/includes/installation/add-nms-repo.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,11 @@ Add the NGINX Instance Manager repository:
2525
sudo yum module disable nginx:1.14
2626
sudo yum module enable nginx:1.20
2727
```
28+
- **RHEL 9**: If you're installing NGINX Open Source package from the yum repository on RHEL 9, run the following commands to use the new version of NGINX Open Source (1.20 at the time of this update):
29+
30+
```bash
31+
sudo yum install nginx-1.20.*
32+
```
2833
2934
- **Amazon Linux 2**
3035

content/includes/nginx-one/alert-labels.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,6 @@ Go to **Notifications > Alerts**. Select the gear icon and select **Alert Name >
2424
| NGINXOffline | An NGINX instance is now offline | Major | Verify the host is online. Check the NGINX Agent's status on the instance and ensure it is connected to the NGINX One Console. |
2525
| NGINXUnavailable | An NGINX instance is now unavailable | Major | Ensure the NGINX Agent and host are active. Verify the NGINX Agent can connect to the NGINX One Console and resolve any network issues. |
2626
| NewNGINX | A new NGINX instance has connected to NGINX One | Minor | Review the instance details in the NGINX One Console. Confirm availability, CVEs, and recommendations to ensure the instance is operational. |
27+
| NGINXCertificateExpired | A certificate on an NGINX instance or Config Sync Group has expired | Critical | Get a new certificate from your certificate authority, then update the TLS/SSL certificate in the NGINX One Console. |
28+
| NGINXCertificateExpiring | A certificate on an NGINX instance or Config Sync Group will expire soon | Major | Renew the certificate through your certificate authority, then update the TLS/SSL certificate in the NGINX One Console. |
2729
{{</bootstrap-table>}}

content/nginxaas-azure/_index.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ and reliable with full lifecycle management of advanced NGINX traffic services.
3636

3737
{{<card-layout>}}
3838
{{<card-section showAsCards="true" >}}
39-
4039
{{<card title="Marketplace billing" titleUrl="/nginxaas/azure/billing/overview/" icon="wallet">}}
4140
See the pricing plans and learn about NGINX Capacity Units (NCUs)
4241
{{</card>}}

content/nim/nginx-app-protect/setup-waf-config-management.md

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -99,9 +99,9 @@ sudo apt-get install nms-nap-compiler-v5.442.0 -o Dpkg::Options::="--force-overw
9999

100100
{{< include "nim/nap-waf/restart-nms-integrations.md" >}}
101101

102-
### RHEL 8.1 or later
102+
### RHEL 8.1
103103

104-
To install the WAF compiler on RHEL 8.1 or later:
104+
To install the WAF compiler on RHEL 8.1 :
105105

106106
1. Download the `dependencies.repo` file to the `/etc/yum.repos.d` directory:
107107

@@ -121,9 +121,9 @@ To install the WAF compiler on RHEL 8.1 or later:
121121
sudo yum install nms-nap-compiler-v5.442.0
122122
```
123123

124-
### RHEL 9 or later
124+
### RHEL 9
125125

126-
To install the WAF compiler on RHEL 9 or later:
126+
To install the WAF compiler on RHEL 9:
127127

128128
1. Download the `dependencies.repo` file to the `/etc/yum.repos.d` directory:
129129

@@ -145,9 +145,9 @@ To install the WAF compiler on RHEL 9 or later:
145145

146146
4. {{< include "nim/nap-waf/restart-nms-integrations.md" >}}
147147

148-
### Oracle Linux 8.1 or later
148+
### Oracle Linux 8.1
149149

150-
To install the WAF compiler on Oracle Linux 7.4 or later:
150+
To install the WAF compiler on Oracle Linux 8.1:
151151

152152
1. Download the `dependencies.repo` file to the `/etc/yum.repos.d` directory:
153153

@@ -240,13 +240,16 @@ error when creating the nginx repo retriever - NGINX repo certificates not found
240240

241241
If needed, you can also [install the WAF compiler manually](#install-the-waf-compiler).
242242

243-
## Install the WAF compiler in a disconnected environment
243+
## Install or update the WAF compiler in a disconnected environment
244244

245245
To install the WAF compiler on a system without internet access, complete these steps:
246246

247247
- **Step 1:** Generate the WAF compiler package on a system that has internet access.
248248
- **Step 2:** Move the generated package to the offline target system and install it.
249249

250+
Note : Version of NAP compiler can be referred from the table at the top of this page.
251+
Current latest version 5.442.0 at the point of writing this document is used in below commands.
252+
250253
{{<tabs name="WAF compiler installation in offline environment">}}
251254

252255
{{%tab name="Ubuntu"%}}
@@ -337,9 +340,9 @@ sudo dpkg -i ./compiler/*.deb
337340

338341
{{%/tab%}}
339342

340-
{{%tab name="RHEL8, RHEL9, Oracle-9 "%}}
343+
{{%tab name="RHEL9, Oracle-9 "%}}
341344

342-
### Install on RHEL 8, RHEL 9, or Oracle Linux 8.1
345+
### Install on RHEL 9 or Oracle Linux 9
343346

344347
#### Step 1: On a system with internet access
345348

@@ -373,9 +376,9 @@ sudo dnf install *.rpm --disablerepo=*
373376

374377
{{%/tab%}}
375378

376-
{{%tab name="Oracle-8"%}}
379+
{{%tab name="Redhat-8, Oracle-8"%}}
377380

378-
### Install on Oracle Linux 8.1
381+
### Install on RHEL-8 or Oracle Linux 8
379382

380383
#### Step 1: On a system with internet access
381384

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ module github.com/nginxinc/docs
22

33
go 1.19
44

5-
require github.com/nginxinc/nginx-hugo-theme v0.43.6 // indirect
5+
require github.com/nginxinc/nginx-hugo-theme v0.43.7 // indirect

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
github.com/nginxinc/nginx-hugo-theme v0.43.6 h1:G9flRI3mMsETE5QHNXQ8ozesJvlRM9qBlrkzYHgZrdc=
2-
github.com/nginxinc/nginx-hugo-theme v0.43.6/go.mod h1:DPNgSS5QYxkjH/BfH4uPDiTfODqWJ50NKZdorguom8M=
1+
github.com/nginxinc/nginx-hugo-theme v0.43.7 h1:GQTeoszoPJV8oYycAxt0qvOYwlP28uZe6oDOCiLi9Dk=
2+
github.com/nginxinc/nginx-hugo-theme v0.43.7/go.mod h1:DPNgSS5QYxkjH/BfH4uPDiTfODqWJ50NKZdorguom8M=

0 commit comments

Comments
 (0)