Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
676aab0
Nap helm chart (#267)
liadlevif5 Mar 13, 2025
fe4959f
Merge branch 'main' into nap-release-5.6
ADubhlaoich Mar 13, 2025
8796d51
feat: Add placeholders for NAP 5.6 / 4.14 release notes (#284)
ADubhlaoich Mar 13, 2025
4351403
Merge branch 'main' into nap-release-5.6
ADubhlaoich Mar 13, 2025
47506fe
feat: Restructure Kubernetes documentation IA, update references
ADubhlaoich Mar 13, 2025
d9a2cf6
feat: Re-order admin-guide pages
ADubhlaoich Mar 13, 2025
ed15702
Merge branch 'main' into nap-release-5.6
ADubhlaoich Mar 14, 2025
eca1987
Merge branch 'main' into nap-release-5.6
ADubhlaoich Mar 18, 2025
0fde624
Update content/nap-waf/v4/releases/about-4.14.md
ADubhlaoich Mar 18, 2025
7db6395
Merge branch 'main' into nap-release-5.6
ADubhlaoich Mar 19, 2025
87ebef6
feat: Remove unnecessary item, move issues from known to resolved
ADubhlaoich Mar 19, 2025
783025a
feat: Update Generated Documentation (#301)
ohad-perets Mar 20, 2025
7e6c17a
Merge branch 'main' into nap-release-5.6
ADubhlaoich Mar 20, 2025
0a8a753
Apply suggestions from code review
ADubhlaoich Mar 20, 2025
4fd6847
feat: Update package names, move Go version bump to resolved issues
ADubhlaoich Mar 20, 2025
5e6509d
Merge branch 'main' into nap-release-5.6
ADubhlaoich Mar 20, 2025
528f96f
feat: Convert K8s configuration to includes for both cases
ADubhlaoich Mar 21, 2025
7c423c7
Merge branch 'main' into nap-release-5.6
ADubhlaoich Mar 24, 2025
adbface
feat: Remove mention of Alpine 3.17
ADubhlaoich Mar 24, 2025
866cc43
Merge branch 'main' into nap-release-5.6
ADubhlaoich Mar 24, 2025
a353c5f
feat: OS version consolidation, remove redundancy
ADubhlaoich Mar 24, 2025
082fc78
Merge branch 'nap-release-5.6' of github.com:nginx/documentation into…
ADubhlaoich Mar 24, 2025
1445026
Merge branch 'main' into nap-release-5.6
ADubhlaoich Mar 25, 2025
d4d46c3
feat: Add JWT step using includes
ADubhlaoich Mar 25, 2025
863efb1
feat: Update text to be imperative
ADubhlaoich Mar 26, 2025
b2150a2
Merge branch 'main' into nap-release-5.6
ADubhlaoich Mar 26, 2025
ab5425d
feat: Additional tab work for NAP5 installation
ADubhlaoich Mar 26, 2025
7bf45fc
feat: Fix formatting of common steps
ADubhlaoich Mar 27, 2025
158f85f
Merge branch 'main' into nap-release-5.6
ADubhlaoich Mar 28, 2025
150d97a
feat: Update release dates
ADubhlaoich Mar 28, 2025
39be196
Update deploy-on-docker.md
ohad-perets Mar 30, 2025
b49d541
Update deploy-on-docker.md
ohad-perets Mar 30, 2025
8e88f49
Merge branch 'main' into nap-release-5.6
ADubhlaoich Mar 31, 2025
0a6a68c
feat: Update package file versions
ADubhlaoich Mar 31, 2025
a934fad
Merge branch 'main' into nap-release-5.6
ADubhlaoich Apr 1, 2025
60436c2
feat: Push additional documentation improvements
ADubhlaoich Apr 1, 2025
3a384c1
Merge branch 'main' of github.com:nginx/documentation into nap-releas…
ADubhlaoich Apr 1, 2025
17175a9
feat: Fix links
ADubhlaoich Apr 1, 2025
14ac99d
Update content/nap-waf/v5/releases/about-5.4.md
ADubhlaoich Apr 1, 2025
898a541
Update deploy-with-helm.md
ohad-perets Apr 1, 2025
5989f59
Update deploy-with-helm.md
ohad-perets Apr 1, 2025
6e1a3eb
Merge branch 'main' into nap-release-5.6
mjang Apr 1, 2025
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
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
1. Upload **nginx-repo.key** to **/etc/apk/cert.key** and **nginx-repo.crt** to **/etc/apk/cert.pem**. Make sure that files do not contain other certificates and keys: Alpine Linux does not support mixing client certificates for different repositories.
Move **nginx-repo.key** to **/etc/apk/cert.key** and **nginx-repo.crt** to **/etc/apk/cert.pem**.

2. Install prerequisite packages:
Make sure that files do not contain other certificates and keys: Alpine Linux does not support mixing client certificates for different repositories.

```shell
sudo apk add openssl ca-certificates
```
Install prerequisite packages:

3. Put NGINX signing public key to directory `/etc/apk/keys`:
```shell
sudo apk add openssl ca-certificates
```

```shell
sudo wget -O /etc/apk/keys/nginx_signing.rsa.pub https://cs.nginx.com/static/keys/nginx_signing.rsa.pub
```
Add the NGINX signing public key to the directory `/etc/apk/keys`:

```shell
sudo wget -O /etc/apk/keys/nginx_signing.rsa.pub https://cs.nginx.com/static/keys/nginx_signing.rsa.pub
```
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
Create the `/etc/ssl/nginx/` directory:

```shell
sudo mkdir -p /etc/ssl/nginx
```

Upload the **nginx-repo.crt** and **nginx-repo.key** files to the `/etc/ssl/nginx/` directory.

Remove any previously downloaded NGINX repository files from `/etc/yum.repos.d`:

```shell
sudo rm /etc/yum.repos.d/nginx*.repo
sudo rm /etc/yum.repos.d/*app-protect*.repo
```

Install the required dependencies:

```shell
sudo dnf install ca-certificates wget
```

Download the `dependencies.repo` file to `/etc/yum.repos.d`:

```shell
sudo wget -P /etc/yum.repos.d https://cs.nginx.com/static/files/dependencies.amazonlinux2023.repo
```

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,50 +1,50 @@
1. Create the `/etc/ssl/nginx/` directory:
Create the `/etc/ssl/nginx/` directory:

```shell
sudo mkdir -p /etc/ssl/nginx
```
```shell
sudo mkdir -p /etc/ssl/nginx
```

2. Upload **nginx-repo.crt** and **nginx-repo.key** files to the `/etc/ssl/nginx/` directory.
Upload **nginx-repo.crt** and **nginx-repo.key** files to the `/etc/ssl/nginx/` directory.

3. Remove any previous NGINX repository and apt configuration files:
Remove any previous NGINX repository and apt configuration files:

```shell
sudo rm /etc/apt/sources.list.d/nginx*.list
sudo rm /etc/apt/sources.list.d/*app-protect*.list
sudo rm /etc/apt/apt.conf.d/90pkgs-nginx
```
```shell
sudo rm /etc/apt/sources.list.d/nginx*.list
sudo rm /etc/apt/sources.list.d/*app-protect*.list
sudo rm /etc/apt/apt.conf.d/90pkgs-nginx
```

4. Install prerequisite packages:
Install prerequisite packages:

```shell
sudo apt-get update && sudo apt-get install apt-transport-https lsb-release ca-certificates wget gnupg2 debian-archive-keyring
```
```shell
sudo apt-get update && sudo apt-get install apt-transport-https lsb-release ca-certificates wget gnupg2 debian-archive-keyring
```

5. Download and add the NGINX signing key:
Download and add the NGINX signing key:

```shell
wget -qO - https://cs.nginx.com/static/keys/nginx_signing.key | gpg --dearmor | \
sudo tee /usr/share/keyrings/nginx-archive-keyring.gpg >/dev/null
```
```shell
wget -qO - https://cs.nginx.com/static/keys/nginx_signing.key | gpg --dearmor | \
sudo tee /usr/share/keyrings/nginx-archive-keyring.gpg >/dev/null
```

6. Download the apt configuration to `/etc/apt/apt.conf.d`:
Download the apt configuration to `/etc/apt/apt.conf.d`:

```shell
sudo wget -P /etc/apt/apt.conf.d https://cs.nginx.com/static/files/90pkgs-nginx
```
```shell
sudo wget -P /etc/apt/apt.conf.d https://cs.nginx.com/static/files/90pkgs-nginx
```

7. Verify that the downloaded file contains the proper key:
Verify that the downloaded file contains the proper key:

```shell
gpg --dry-run --quiet --no-keyring --import --import-options import-show /usr/share/keyrings/nginx-archive-keyring.gpg
```
```shell
gpg --dry-run --quiet --no-keyring --import --import-options import-show /usr/share/keyrings/nginx-archive-keyring.gpg
```

The output should contain the full fingerprint `573BFD6B3D8FBC641079A6ABABF5BD827BD9BF62` as follows:
The output should contain the full fingerprint `573BFD6B3D8FBC641079A6ABABF5BD827BD9BF62` as follows:

```none
pub rsa2048 2011-08-19 [SC] [expires: 2027-05-24]
573BFD6B3D8FBC641079A6ABABF5BD827BD9BF62
uid nginx signing key <[email protected]>
```
```none
pub rsa2048 2011-08-19 [SC] [expires: 2027-05-24]
573BFD6B3D8FBC641079A6ABABF5BD827BD9BF62
uid nginx signing key <[email protected]>
```

If the fingerprint is different, remove the file.
If the fingerprint is different, remove the file.
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
1. Create the `/etc/ssl/nginx` directory:
Create the `/etc/ssl/nginx/` directory:

```shell
sudo mkdir -p /etc/ssl/nginx
```
```shell
sudo mkdir -p /etc/ssl/nginx
```

2. Upload **nginx-repo.crt** and **nginx-repo.key** files to the `/etc/ssl/nginx/` directory.
Upload **nginx-repo.crt** and **nginx-repo.key** files to the `/etc/ssl/nginx/` directory.

3. Remove any previously downloaded NGINX repository files from `/etc/yum.repos.d`:
Remove any previously downloaded NGINX repository files from `/etc/yum.repos.d`:

```shell
sudo rm /etc/yum.repos.d/nginx*.repo
sudo rm /etc/yum.repos.d/*app-protect*.repo
```
```shell
sudo rm /etc/yum.repos.d/nginx*.repo
sudo rm /etc/yum.repos.d/*app-protect*.repo
```

4. Install required dependencies:
Install required dependencies:

```shell
sudo dnf install ca-certificates wget
```
```shell
sudo dnf install ca-certificates wget
```

5. Download the `dependencies.repo` file to `/etc/yum.repos.d`:
Download the `dependencies.repo` file to `/etc/yum.repos.d`:

```shell
sudo wget -P /etc/yum.repos.d https://cs.nginx.com/static/files/dependencies.repo
```
```shell
sudo wget -P /etc/yum.repos.d https://cs.nginx.com/static/files/dependencies.repo
```
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
1. Create the `/etc/ssl/nginx` directory:
Create the `/etc/ssl/nginx/` directory:

```shell
sudo mkdir -p /etc/ssl/nginx
```
```shell
sudo mkdir -p /etc/ssl/nginx
```

2. Upload **nginx-repo.crt** and **nginx-repo.key** files to the `/etc/ssl/nginx/` directory.
Upload **nginx-repo.crt** and **nginx-repo.key** files to the `/etc/ssl/nginx/` directory.

3. Remove any previously downloaded NGINX repository files from `/etc/yum.repos.d`:
Remove any previously downloaded NGINX repository files from `/etc/yum.repos.d`:

```shell
sudo rm /etc/yum.repos.d/nginx*.repo
sudo rm /etc/yum.repos.d/*app-protect*.repo
```
```shell
sudo rm /etc/yum.repos.d/nginx*.repo
sudo rm /etc/yum.repos.d/*app-protect*.repo
```

4. Install required dependencies:
Install required dependencies:

```shell
sudo yum install ca-certificates wget
```
```shell
sudo yum install ca-certificates wget
```

5. Download the `dependencies.repo` file to `/etc/yum.repos.d`:
Download the `dependencies.repo` file to `/etc/yum.repos.d`:

```shell
sudo wget -P /etc/yum.repos.d https://cs.nginx.com/static/files/dependencies.repo
```
```shell
sudo wget -P /etc/yum.repos.d https://cs.nginx.com/static/files/dependencies.repo
```
Original file line number Diff line number Diff line change
@@ -1,50 +1,50 @@
1. Create the `/etc/ssl/nginx/` directory:
Create the `/etc/ssl/nginx/` directory:

```shell
sudo mkdir -p /etc/ssl/nginx
```
```shell
sudo mkdir -p /etc/ssl/nginx
```

2. Upload **nginx-repo.crt** and **nginx-repo.key** files to the `/etc/ssl/nginx/` directory.
Upload **nginx-repo.crt** and **nginx-repo.key** files to the `/etc/ssl/nginx/` directory.

3. Remove any previous NGINX repository and apt configuration files:
Remove any previous NGINX repository and apt configuration files:

```shell
sudo rm /etc/apt/sources.list.d/nginx*.list
sudo rm /etc/apt/sources.list.d/*app-protect*.list
sudo rm /etc/apt/apt.conf.d/90pkgs-nginx
```
```shell
sudo rm /etc/apt/sources.list.d/nginx*.list
sudo rm /etc/apt/sources.list.d/*app-protect*.list
sudo rm /etc/apt/apt.conf.d/90pkgs-nginx
```

4. Install prerequisite packages:
Install prerequisite packages:

```shell
sudo apt-get update && sudo apt-get install apt-transport-https lsb-release ca-certificates wget gnupg2 ubuntu-keyring
```
```shell
sudo apt-get update && sudo apt-get install apt-transport-https lsb-release ca-certificates wget gnupg2 ubuntu-keyring
```

5. Download and add the NGINX signing key:
Download and add the NGINX signing key:

```shell
wget -qO - https://cs.nginx.com/static/keys/nginx_signing.key | gpg --dearmor | \
sudo tee /usr/share/keyrings/nginx-archive-keyring.gpg >/dev/null
```
```shell
wget -qO - https://cs.nginx.com/static/keys/nginx_signing.key | gpg --dearmor | \
sudo tee /usr/share/keyrings/nginx-archive-keyring.gpg >/dev/null
```

6. Download the apt configuration to `/etc/apt/apt.conf.d`:
Download the apt configuration to `/etc/apt/apt.conf.d`:

```shell
sudo wget -P /etc/apt/apt.conf.d https://cs.nginx.com/static/files/90pkgs-nginx
```
```shell
sudo wget -P /etc/apt/apt.conf.d https://cs.nginx.com/static/files/90pkgs-nginx
```

7. Verify that the downloaded file contains the proper key:
Verify that the downloaded file contains the proper key:

```shell
gpg --dry-run --quiet --no-keyring --import --import-options import-show /usr/share/keyrings/nginx-archive-keyring.gpg
```
```shell
gpg --dry-run --quiet --no-keyring --import --import-options import-show /usr/share/keyrings/nginx-archive-keyring.gpg
```

The output should contain the full fingerprint `573BFD6B3D8FBC641079A6ABABF5BD827BD9BF62` as follows:
The output should contain the full fingerprint `573BFD6B3D8FBC641079A6ABABF5BD827BD9BF62` as follows:

```none
pub rsa2048 2011-08-19 [SC] [expires: 2027-05-24]
573BFD6B3D8FBC641079A6ABABF5BD827BD9BF62
uid nginx signing key <[email protected]>
```
```none
pub rsa2048 2011-08-19 [SC] [expires: 2027-05-24]
573BFD6B3D8FBC641079A6ABABF5BD827BD9BF62
uid nginx signing key <[email protected]>
```

If the fingerprint is different, remove the file.
If the fingerprint is different, remove the file.
Original file line number Diff line number Diff line change
@@ -1,15 +1,21 @@
1. Set up the apk repository for mainline nginx packages:
Set up the apk repository for mainline nginx packages:

```shell
printf "%s%s%s\n" \
"http://nginx.org/packages/mainline/alpine/v" \
`egrep -o '^[0-9]+\.[0-9]+' /etc/alpine-release` \
"/main" \
| sudo tee -a /etc/apk/repositories
```
```shell
printf "%s%s%s\n" \
"http://nginx.org/packages/mainline/alpine/v" \
`egrep -o '^[0-9]+\.[0-9]+' /etc/alpine-release` \
"/main" \
| sudo tee -a /etc/apk/repositories
```

2. Add the NGINX App Protect WAF v5 apk repository:
Add the NGINX App Protect WAF v5 apk repository:

```shell
printf "https://pkgs.nginx.com/app-protect-x-oss/alpine/v`egrep -o '^[0-9]+\.[0-9]+' /etc/alpine-release`/main\n" | sudo tee -a /etc/apk/repositories
```
```shell
printf "https://pkgs.nginx.com/app-protect-x-oss/alpine/v`egrep -o '^[0-9]+\.[0-9]+' /etc/alpine-release`/main\n" | sudo tee -a /etc/apk/repositories
```

Install the NGINX App Protect WAF v5 package:

```shell
sudo apk add app-protect-module-oss
```
Loading
Loading