Skip to content

Commit 09e479d

Browse files
11t9711t97
authored
Merge branch 'main' into patch-3
2 parents fb831c0 + 1b3a70f commit 09e479d

File tree

13 files changed

+41
-51
lines changed

13 files changed

+41
-51
lines changed

‎.github/pull_request_template.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,16 @@ Closes #ISSUE
2121

2222
Before merging a pull request, run through this checklist and mark each as complete.
2323

24-
- [ ] I have read the [contributing guidelines](/CONTRIBUTING.md)
24+
- [ ] I have read the [contributing guidelines](https://github.com/nginx/documentation/blob/main/CONTRIBUTING.md)
2525
- [ ] I have signed the [F5 Contributor License Agreement (CLA)](https://github.com/f5/.github/blob/main/CLA/cla-markdown.md)
26-
- [ ] I have ensured that documentation content adheres to [the style guide](/templates/style-guide.md)
26+
- [ ] I have ensured that documentation content adheres to [the style guide](https://github.com/nginx/documentation/blob/main/templates/style-guide.md)
2727
- [ ] If the change involves potentially sensitive changes, I have assessed the possible impact
2828
- [ ] If applicable, I have added tests that prove my fix is effective or that my feature works
2929
- [ ] If applicable, I have checked that any relevant tests pass after adding my changes
30-
- [ ] I have updated any relevant documentation ([`README.md`](/README.md) and [`CHANGELOG.md`](/CHANGELOG.md))
30+
- [ ] I have updated any relevant documentation ([`README.md`](https://github.com/nginx/documentation/blob/main/README.md) and [`CHANGELOG.md`](https://github.com/nginx/documentation/blob/main/CHANGELOG.md)
3131
- [ ] I have rebased my branch onto main
3232
- [ ] I will ensure my PR is targeting the main branch and pulling from my branch from my own fork
3333

3434
Potentially sensitive changes include anything involving code, personally identify information (PII), live URLs or significant amounts of new or revised documentation.
3535

36-
Please refer to [our style guide](/templates/style-guide.md) for guidance about placeholder content.
36+
Please refer to [our style guide](https://github.com/nginx/documentation/blob/main/templates/style-guide.md) for guidance about placeholder content.

‎.github/workflows/build-push.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ jobs:
5959
uses: nginxinc/docs-actions/.github/workflows/docs-build-push.yml@9c59fab05a8131f4d691ba6ea2b6a119f3ef832a # v1.0.7
6060
with:
6161
production_url_path: ""
62-
preview_url_path: "/previews/docs"
62+
preview_url_path: "${{ vars.PREVIEW_URL_PATH }}"
6363
docs_source_path: "public"
6464
docs_build_path: "./"
6565
doc_type: "hugo"

‎archetypes/concept.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ It is an example of a <other concept>, and is closely related to <third concept>
3535

3636
## Use cases
3737

38-
[//]: # "Name the individual use case sections after the actual use case itself, e.g "Route traffic between applications"
38+
[//]: # "Name the individual use case sections after the actual use case itself, e.g 'Route traffic between applications'"
3939

4040
### Use case 1
4141

‎content/controller/_index.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ weight: 2100
66
cascade:
77
logo: "NGINX-Controller-product-icon-RGB.svg"
88
type: "ctlr-eos"
9+
noindex: true
910
url: /nginx-controller/
1011
---
1112

‎content/includes/nim/tech-specs/nim-app-protect-support.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ NGINX Instance Manager supports the following versions of [NGINX App Protect WAF
88

99
| NGINX Instance Manager | NGINX App Protect WAF |
1010
|------------------------|------------------------------------|
11-
| 2.17.0–2.18.0 | Release 4.8.0–4.12.0, 5.1.0–5.4.0 |
11+
| 2.17.0–2.19.0 | Release 4.8.0–4.13.0, 5.1.0–5.5.0 |
1212
| 2.15.1–2.16.0 | Release 4.8.0–4.10.0 |
1313
| 2.14.1–2.15.0 | Release 4.4.0–4.7.0 |
1414
| 2.13.0–2.14.0 | Release 4.3.0–4.5.0 |

‎content/includes/nim/templates/additional-templating-resources.md‎

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,6 @@
22
docs: DOCS-1500
33
---
44

5-
#### Concepts
5+
<br>
66

7-
- **[Understand Config Templates]({{< relref "nim/nginx-configs/config-templates/concepts/config-templates.md" >}})**: Learn about config template types, publication targets, and the template submission process.
8-
9-
- **[F5 Global Default Base Template]({{< relref "nim/nginx-configs/config-templates/concepts/default-base-template.md" >}})**: Learn about the F5 Global Default Base Template, including its key components and usage. Discover how augment templates can be used to segment portions of the base template.
10-
11-
- **[Augment Templates]({{< relref "nim/nginx-configs/config-templates/concepts/augment-templates.md" >}})**: Learn how augment templates can be combined with base templates to add specific features like OIDC authentication, or segment (compartmentalize) configuration elements like location and server blocks.
12-
13-
- **[Template Resource Files]({{< relref "nim/nginx-configs/config-templates/concepts/template-resources.md" >}})**: Learn about template resource files, including config template files, JSON schemas, and auxiliary files.
14-
15-
- **[Dynamic Form JSON Schema]({{< relref "/nim/nginx-configs/config-templates/reference/json-schema-reference.md" >}})**: Learn how to use JSON schemas for template input and validation in the dynamic web form builder.
16-
17-
#### How-Tos
18-
19-
- **[Manage NGINX Configs with Config Templates]({{< relref "/nim/nginx-configs/config-templates/how-to/manage-nginx-configs-with-templates.md" >}})**: Create, import, and deploy NGINX configurations using config templates.
20-
21-
- **[Access Control for Templates and Template Submissions]({{< relref "/nim/nginx-configs/config-templates/how-to/rbac-config-templates-and-submissions.md" >}})**: Apply role-based access control (RBAC) settings to templates and template submissions.
7+
<i class="fa-solid fa-download"></i> [Download example config templates for NGINX Instance Manager from GitHub](https://github.com/f5devcentral/n1_nim_template_examples)

‎content/mesh/_index.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,6 @@ linkTitle: "NGINX Service Mesh"
66
menu: docs
77
cascade:
88
type: "mesh-eos"
9+
noindex: true
910
url: /nginx-service-mesh/
1011
---

‎content/modsec-waf/_index.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ description: |
66
weight: 5000
77
url: /nginx-waf/
88
cascade:
9+
noindex: true
910
logo: "NGINX-WAF-product-icon-RGB.svg"
1011
---
1112

‎content/ngf/support.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,6 @@ Visit the [project’s GitHub repository](https://github.com/nginxinc/nginx-supp
4040

4141
- If you have any suggestions or enhancement requests, please [open an idea](https://github.com/nginx/nginx-gateway-fabric/discussions/categories/ideas) on GitHub discussions.
4242

43-
- You can contact us directly, by sending an email to [[email protected]](mailto:[email protected]) or on the [NGINX Community Slack](https://nginxcommunity.slack.com/channels/nginx-gateway-fabric), in the #nginx-gateway-fabric channel.
43+
- You can also get help through the [NGINX Community Forum](https://community.nginx.org/).
4444

4545
- If you need dedicated support for NGINX Gateway Fabric, or you would like to leverage our [advanced NGINX Plus features](https://docs.nginx.com/nginx-gateway-fabric/overview/nginx-plus/), you can contact [F5 Sales](https://www.f5.com/content/f5-com/en_us/products/get-f5).

‎content/nim/deploy/kubernetes/deploy-using-helm.md‎

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -132,27 +132,31 @@ The `values.yaml` file customizes the Helm chart installation without modifying
132132
- name: regcred
133133
apigw:
134134
image:
135-
repository: private-registry.nginx.com/nms-apigw
135+
repository: private-registry.nginx.com/nms/apigw
136136
tag: <version>
137137
core:
138138
image:
139-
repository: private-registry.nginx.com/nms-core
139+
repository: private-registry.nginx.com/nms/core
140140
tag: <version>
141141
dpm:
142142
image:
143-
repository: private-registry.nginx.com/nms-dpm
143+
repository: private-registry.nginx.com/nms/dpm
144144
tag: <version>
145145
ingestion:
146146
image:
147-
repository: private-registry.nginx.com/nms-ingestion
147+
repository: private-registry.nginx.com/nms/ingestion
148148
tag: <version>
149149
integrations:
150150
image:
151-
repository: private-registry.nginx.com/nms-integrations
151+
repository: private-registry.nginx.com/nms/integrations
152+
tag: <version>
153+
secmon:
154+
image:
155+
repository: private-registry.nginx.com/nms/secmon
152156
tag: <version>
153157
utility:
154158
image:
155-
repository: private-registry.nginx.com/nms-utility
159+
repository: private-registry.nginx.com/nms/utility
156160
tag: <version>
157161
```
158162
@@ -212,6 +216,7 @@ By default, the following network policies will be created in the release namesp
212216
dpm app.kubernetes.io/name=dpm 4m47s
213217
ingestion app.kubernetes.io/name=ingestion 4m47s
214218
integrations app.kubernetes.io/name=integrations 4m47s
219+
secmon app.kubernetes.io/name=secmon 4m47s
215220
utility app.kubernetes.io/name=integrations 4m47s
216221
```
217222

0 commit comments

Comments
 (0)