Pre OSS commit

nginx · nginx · commit 58ae92e5c192 · 2023-05-16T10:32:47.000-06:00
diff --git a/.gitignore b/.gitignore
@@ -32,6 +32,7 @@ content/.idea/*
 
 # Local Netlify artifacts
 .netlify/plugins/*
+.netlify/
 
 *.pyc
 build
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -16,7 +16,12 @@ This is the initial version of the NGINX documentation repo.
 
 [Fix broken refs in nms docs](https://github.com/nginxinc/docs/pull/73)
 
-## 0.4.0 (May 5, 2023)
+## 0.3.2
+
+Fixes [#78](https://github.com/nginxinc/docs/issues/78)
+Update list page layout to allow weight-based ranking across pages and sections
+
+# #0.4.0 (May 5, 2023)
 
 [Merge NAP-WAF docs](https://github.com/nginxinc/docs/pull/86)
 
@@ -28,4 +33,6 @@ This is the initial version of the NGINX documentation repo.
 
 [Merge N-Plus docs](https://github.com/nginxinc/docs/pull/96)
 
+## 0.7.0 (May 14, 2023)
 
+[Production readiness: permalinks and url management](https://github.com/nginxinc/docs/pull/95)
diff --git a/Makefile b/Makefile
@@ -40,3 +40,4 @@ docs:
 
 deploy-preview: hugo-mod
 	hugo --gc -b ${NETLIFY_DEPLOY_URL}
+	cp _redirects_dev public/_redirects
diff --git a/_redirects_dev b/_redirects_dev
@@ -33,5 +33,3 @@
 /nginx-service-mesh/* https://development--mesh-public-docs.netlify.app/nginx-service-mesh/:splat 200!
 # /nginx-waf/* https://development--nginx-waf-docs.netlify.app/nginx-waf/:splat 200!
 
-# Keep at the bottom, otherwise the backend site redirects will break
-/* /404.html 404
diff --git a/config/_default/config.toml b/config/_default/config.toml
@@ -3,6 +3,14 @@ languageCode = "en-us"
 title = "NGINX Documentation"
 refLinksErrorLevel = "ERROR"
 
+[permalinks]
+  controller = '/nginx-controller/:sections[1:]/:filename'
+  modsec-waf = '/nginx-waf/:sections[1:]/:filename'
+  nap-dos = '/nginx-app-protect-dos/:sections[1:]/:filename'
+  nap-waf = '/nginx-app-protect-waf/:sections[1:]/:filename'
+  nms = '/nginx-management-suite/:sections[1:]/:filename'
+
+
 [caches]
   [caches.modules]
     maxAge = -1
diff --git a/config/_default/server.toml b/config/_default/server.toml
diff --git a/config/development/config.toml b/config/development/config.toml
@@ -1,4 +1,4 @@
-baseURL = "https://docs-dev.nginx.com/"
+baseURL = "https://docs-dev.nginx.com"
 title = "DEV -- docs-nginx-com"
 disableKinds = ["sitemap"]
 
diff --git a/config/production/config.toml b/config/production/config.toml
@@ -1,4 +1,4 @@
-baseURL = "https://docs.nginx.com/"
+baseURL = "https://docs.nginx.com"
 title = "NGINX Documentation"
 
 [privacy]
diff --git a/config/staging/config.toml b/config/staging/config.toml
@@ -1,3 +1,3 @@
-baseURL = "https://docs-staging.nginx.com/"
+baseURL = "https://docs-staging.nginx.com"
 title = "STAGING - docs-nginx-com"
 disableKinds = ["sitemap"]
diff --git a/content/modsec-waf/_index.md b/content/modsec-waf/_index.md
@@ -4,6 +4,7 @@ description: |
     F5 NGINX ModSecurity WAF reached End of Sale (EoS) effective April 1, 2022.
     No further renewals are accepted as of April 1, 2023.   
 weight: 5000
+url: /nginx-waf/
 ---
 
 {{< important >}}
diff --git a/content/modsec-waf/admin-guide/_index.md b/content/modsec-waf/admin-guide/_index.md
@@ -1,5 +1,6 @@
 ---
 title: Administration Guide
+url: /nginx-waf/admin-guide/
 ---
 
 {{% modsec-eol-notice %}}  
diff --git a/content/nap-dos/_index.md b/content/nap-dos/_index.md
@@ -2,4 +2,5 @@
 description: "NGINX App Protect DoS provides behavioral DoS detection and mitigation.\n\nRequest
   your [free 30-day trial](https://www.nginx.com/free-trial-request/) today. \n"
 title: NGINX App Protect DoS
+url: /nginx-app-protect-dos/
 ---
diff --git a/content/nap-dos/deployment-guide/_index.md b/content/nap-dos/deployment-guide/_index.md
@@ -5,5 +5,6 @@ menu:
     parent: NGINX App Protect DoS Documentation.
 title: Deployment Guide
 weight: 100
+url: /nginx-app-protect-dos/deployment-guide/
 ---
 
diff --git a/content/nap-dos/directives-and-policy/_index.md b/content/nap-dos/directives-and-policy/_index.md
@@ -6,4 +6,5 @@ menu:
     parent: NGINX App Protect DoS Documentation.
 title: Directives and Policy
 weight: 120
+url: /nginx-app-protect-dos/directives-and-policy/
 ---
diff --git a/content/nap-dos/monitoring/_index.md b/content/nap-dos/monitoring/_index.md
@@ -6,4 +6,5 @@ menu:
     parent: NGINX App Protect DoS Documentation.
 title: Monitoring
 weight: 130
+url: /nginx-app-protect-dos/monitoring/
 ---
diff --git a/content/nap-dos/releases/_index.md b/content/nap-dos/releases/_index.md
@@ -5,4 +5,5 @@ menu:
     parent: NGINX App Protect DoS Documentation.
 title: Releases
 weight: 220
+url: /nginx-app-protect-dos/releases/
 ---
diff --git a/content/nap-dos/troubleshooting-guide/_index.md b/content/nap-dos/troubleshooting-guide/_index.md
@@ -5,4 +5,5 @@ menu:
     parent: NGINX App Protect DoS Documentation.
 title: Troubleshooting Guide
 weight: 200
+url: /nginx-app-protect-dos/troubleshooting-guide/
 ---
diff --git a/content/nap-waf/_index.md b/content/nap-waf/_index.md
@@ -7,4 +7,5 @@ linkTitle: NGINX App Protect WAF
 menu: docs
 title: NGINX App Protect WAF
 weight: 100
+url: /nginx-app-protect-waf/
 ---
diff --git a/content/nap-waf/admin-guide/_index.md b/content/nap-waf/admin-guide/_index.md
@@ -6,4 +6,5 @@ menu:
     parent: NGINX App Protect WAF Documentation.
 title: Administration Guides
 weight: 100
+url: /nginx-app-protect-waf/admin-guide/
 ---
diff --git a/content/nap-waf/configuration-guide/_index.md b/content/nap-waf/configuration-guide/_index.md
@@ -5,4 +5,5 @@ menu:
     parent: NGINX App Protect WAF Documentation.
 title: Configuration Guide
 weight: 100
+url: /nginx-app-protect-waf/configuration-guide/
 ---
diff --git a/content/nap-waf/declarative-policy/_index.md b/content/nap-waf/declarative-policy/_index.md
@@ -5,4 +5,5 @@ menu:
     parent: NGINX App Protect WAF Documentation.
 title: Declarative Policy
 weight: 100
+url: /nginx-app-protect-waf/declarative-policy/
 ---
diff --git a/content/nap-waf/logging-overview/_index.md b/content/nap-waf/logging-overview/_index.md
@@ -6,4 +6,5 @@ menu:
     parent: NGINX App Protect WAF Documentation.
 title: Logging Overview
 weight: 100
+url: /nginx-app-protect-waf/logging-overview/
 ---
diff --git a/content/nap-waf/releases/_index.md b/content/nap-waf/releases/_index.md
@@ -5,4 +5,5 @@ menu:
     parent: NGINX App Protect WAF
 title: Releases
 weight: 500
+url: /nginx-app-protect-waf/releases/
 ---
diff --git a/content/nap-waf/troubleshooting-guide/_index.md b/content/nap-waf/troubleshooting-guide/_index.md
@@ -5,4 +5,5 @@ menu:
     parent: NGINX App Protect WAF Documentation.
 title: Troubleshooting Guide
 weight: 100
+url: /nginx-app-protect-waf/troubleshooting-guide/
 ---
diff --git a/content/nms/.gitkeep b/content/nms/.gitkeep
diff --git a/content/nms/_index.md b/content/nms/_index.md
@@ -1,5 +1,6 @@
 ---
 title: NGINX Management Suite
 description: A set of tools that enable enterprise scalability, security, observability, and governance.
+url: /nginx-management-suite/
 ---
 
diff --git a/content/nms/acm/_index.md b/content/nms/acm/_index.md
@@ -3,4 +3,5 @@ title: API Connectivity Manager
 weight: 500
 aliases:
   - /nginx-api-connectivity-manager/
+url: /nginx-management-suite/acm/
 ---
diff --git a/content/nms/acm/about/_index.md b/content/nms/acm/about/_index.md
@@ -2,4 +2,5 @@
 description: "Learn about API Connectivity Manager"
 title: About
 weight: 100
+url: /nginx-management-suite/acm/about/
 ---
diff --git a/content/nms/acm/getting-started/_index.md b/content/nms/acm/getting-started/_index.md
@@ -1,8 +1,8 @@
 ---
-description: "Learn how to get up and running with NGINX Management Suite API Connectivity Manager"
-title: Quick Start Guides
+description: "Learn how to get up and running with NGINX Management Suite API Connectivity Manager."
+title: Getting Started Guides
 weight: 400
-
+url: /nginx-management-suite/acm/getting-started/
 ---
 
 
diff --git a/content/nms/acm/how-to/_index.md b/content/nms/acm/how-to/_index.md
@@ -2,5 +2,5 @@
 description: "Task-oriented topics that focus on how to use NGINX Management Suite API Connectivity Manager."
 title: How-To Guides
 weight: 500
-
+url: /nginx-management-suite/acm/how-to/
 ---
diff --git a/content/nms/acm/how-to/devportals/_index.md b/content/nms/acm/how-to/devportals/_index.md
@@ -1,4 +1,5 @@
 ---
 title: Developer Portals
 weight: 300
+url: /nginx-management-suite/acm/how-to/devportals/
 ---
diff --git a/content/nms/acm/how-to/infrastructure/_index.md b/content/nms/acm/how-to/infrastructure/_index.md
@@ -1,4 +1,5 @@
 ---
 title: Infrastructure
 weight: 100
+url: /nginx-management-suite/acm/how-to/infrastructure/
 ---
diff --git a/content/nms/acm/how-to/policies/_index.md b/content/nms/acm/how-to/policies/_index.md
@@ -1,4 +1,5 @@
 ---
 title: Policies
-weight: 400
+weight: 1000
+url: /nginx-management-suite/acm/how-to/policies/
 ---
diff --git a/content/nms/acm/how-to/services/_index.md b/content/nms/acm/how-to/services/_index.md
@@ -1,4 +1,5 @@
 ---
 title: Services
 weight: 200
+url: /nginx-management-suite/acm/how-to/services/
 ---
diff --git a/content/nms/acm/reference/policies/_index.md b/content/nms/acm/reference/policies/_index.md
@@ -2,5 +2,5 @@
 title: Policies
 description: "Policy documentation for NGINX Management Suite API Connectivity Manager."
 weight: 100
-draft: false
+draft: true
 ---
diff --git a/content/nms/acm/releases/_index.md b/content/nms/acm/releases/_index.md
@@ -3,4 +3,5 @@ title: Releases
 description: "Stay up-to-date with the latest NGINX Management Suite API Connectivity Manager releases."
 weight: 800
 draft: false
+url: /nginx-management-suite/acm/releases/
 ---
diff --git a/content/nms/acm/tutorials/_index.md b/content/nms/acm/tutorials/_index.md
@@ -3,4 +3,5 @@ description: "The guides in this section feature end-to-end examples that will h
 title: Tutorials
 weight: 600
 draft: false
+url: /nginx-management-suite/acm/tutorials/
 ---
diff --git a/content/nms/adm/_index.md b/content/nms/adm/_index.md
@@ -2,6 +2,5 @@
 title: NGINX Application Delivery Manager
 weight: 700
 draft: true
-aliases:
-  - /nginx-app-delivery-manager/
+url: /nginx-management-suite/adm/
 ---
diff --git a/content/nms/admin-guides/_index.md b/content/nms/admin-guides/_index.md
@@ -3,4 +3,5 @@ title: Admin Guides
 weight: 100
 aliases:
 - /nim/installation/
+url: /nginx-management-suite/admin-guides/
 ---
diff --git a/content/nms/admin-guides/access-control/_index.md b/content/nms/admin-guides/access-control/_index.md
@@ -1,5 +1,5 @@
 ---
 description: "The topics in this section explain how to add users and configure user access for NGINX Management Suite."
-title: Access Control
-weight: 300
+title: Access Co
+url: /nginx-management-suite/admin-guides/access-control/
 ---
diff --git a/content/nms/admin-guides/getting-started/_index.md b/content/nms/admin-guides/getting-started/_index.md
@@ -1,4 +1,5 @@
 ---
 title: Getting Started
 weight: 200
+url: /nginx-management-suite/admin-guides/getting-started/
 ---
diff --git a/content/nms/admin-guides/installation/_index.md b/content/nms/admin-guides/installation/_index.md
@@ -2,6 +2,7 @@
 description: "This section lists the different ways to install F5 NGINX Management Suite, including the Instance Manager and API Connectivity Manager modules."
 title: Installation
 weight: 100
+url: /nginx-management-suite/admin-guides/installation/
 ---
 
 
diff --git a/content/nms/admin-guides/installation/kubernetes/_index.md b/content/nms/admin-guides/installation/kubernetes/_index.md
@@ -1,6 +1,7 @@
 ---
 title: Kubernetes
 weight: 200
+url: /nginx-management-suite/admin-guides/installation/kubernetes/
 ---
 
 
diff --git a/content/nms/admin-guides/installation/on-prem/_index.md b/content/nms/admin-guides/installation/on-prem/_index.md
@@ -1,6 +1,7 @@
 ---
 title: On-Premises
 weight: 100
+url: /nginx-management-suite/admin-guides/installation/on-prem/
 ---
 
 
diff --git a/content/nms/admin-guides/maintenance/_index.md b/content/nms/admin-guides/maintenance/_index.md
@@ -1,6 +1,7 @@
 ---
 title: Maintenance
 weight: 400
+url: /nginx-management-suite/admin-guides/maintenance/
 ---
 
 
diff --git a/content/nms/nginx-agent/_index.md b/content/nms/nginx-agent/_index.md
@@ -2,6 +2,7 @@
 description: "Learn about the NGINX Agent"
 title: NGINX Agent
 weight: 300
+url: /nginx-management-suite/nginx-agent/
 ---
 
 
diff --git a/content/nms/nim/_index.md b/content/nms/nim/_index.md
@@ -3,4 +3,5 @@ title: Instance Manager
 weight: 400
 aliases:
   - /nginx-instance-manager/
+url: /nginx-management-suite/nim/
 ---
diff --git a/content/nms/nim/about/_index.md b/content/nms/nim/about/_index.md
@@ -2,6 +2,7 @@
 description: "Learn about Instance Manager"
 title: About
 weight: 100
+url: /nginx-management-suite/nim/about/
 ---
 
 
diff --git a/content/nms/nim/getting-started/_index.md b/content/nms/nim/getting-started/_index.md
@@ -2,6 +2,8 @@
 title: Quick Start Guides
 description: "Learn how to get up and running with NGINX Management Suite Instance Manager"
 weight: 400
+url: /nginx-management-suite/nim/getting-started/
+
 ---
 
 
diff --git a/content/nms/nim/how-to/_index.md b/content/nms/nim/how-to/_index.md
@@ -2,6 +2,7 @@
 title: How-To Guides
 weight: 500
 description: "Task-oriented topics that focus on how to use NGINX Management Suite Instance Manager."
+url: /nginx-management-suite/nim/how-to/
 ---
 
 
diff --git a/content/nms/nim/how-to/app-protect/_index.md b/content/nms/nim/how-to/app-protect/_index.md
@@ -1,4 +1,5 @@
 ---
 title: Manage App Protect Configurations
 weight: 200
+url: /nginx-management-suite/nim/how-to/app-protect/
 ---
diff --git a/content/nms/nim/how-to/nginx/_index.md b/content/nms/nim/how-to/nginx/_index.md
diff --git a/content/nms/nim/previous-versions/_index.md b/content/nms/nim/previous-versions/_index.md
diff --git a/content/nms/nim/previous-versions/v1/_index.md b/content/nms/nim/previous-versions/v1/_index.md
diff --git a/content/nms/nim/releases/_index.md b/content/nms/nim/releases/_index.md
diff --git a/content/nms/nim/tutorials/_index.md b/content/nms/nim/tutorials/_index.md
diff --git a/content/nms/reference/_index.md b/content/nms/reference/_index.md
diff --git a/content/nms/reference/catalogs/_index.md b/content/nms/reference/catalogs/_index.md
diff --git a/content/nms/security/_index.md b/content/nms/security/_index.md
diff --git a/content/nms/security/how-to/_index.md b/content/nms/security/how-to/_index.md
diff --git a/content/nms/security/releases/_index.md b/content/nms/security/releases/_index.md
diff --git a/content/nms/support/_index.md b/content/nms/support/_index.md
diff --git a/layouts/partials/list-main.html b/layouts/partials/list-main.html
diff --git a/netlify.toml b/netlify.toml

Original file line number	Diff line number	Diff line change
`@@ -40,3 +40,4 @@ docs:`
`40`	`40`
`41`	`41`	`deploy-preview: hugo-mod`
`42`	`42`	`hugo --gc -b ${NETLIFY_DEPLOY_URL}`
	`43`	`+ cp _redirects_dev public/_redirects`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-baseURL = "https://docs.nginx.com/"`
	`1`	`+baseURL = "https://docs.nginx.com"`
`2`	`2`	`title = "NGINX Documentation"`
`3`	`3`
`4`	`4`	`[privacy]`