Merge pull request #179094 from duongau/afdwaf

AFD and AFDx TOC - added WAF concept section

Author: PMEds28

.openpublishing.redirection.json

@@ -418,6 +418,11 @@
       "redirect_url": "/articles/frontdoor/front-door-ddos",
       "redirect_document_id": false
     },
+    {
+      "source_path_from_root": "/articles/frontdoor/standard-premium/geo-filtering.md",
+      "redirect_url": "/articles/frontdoor/front-door-geo-filtering",
+      "redirect_document_id": false
+    },
     {
       "source_path_from_root": "/articles/azure-sql/database/doc-changes-updates-release-notes.md",
       "redirect_url": "/azure/azure-sql/database/doc-changes-updates-release-notes-whats-new",

articles/frontdoor/TOC.yml

@@ -48,8 +48,6 @@
     href: front-door-health-probes.md
   - name: Wildcard domain
     href: front-door-wildcard-domain.md
-  - name: Geo-filtering
-    href: front-door-geo-filtering.md
   - name: Rules Engine
     items:  
     - name: Rules Engine architecture
@@ -70,6 +68,20 @@
       href: front-door-ddos.md
     - name: End-to-end TLS encryption
       href: concept-end-to-end-tls.md
+    - name: Web Application Firewall
+      items:
+      - name: Tuning
+        href: ../web-application-firewall/afds/waf-front-door-tuning.md?toc=%2fazure%2ffrontdoor%2ftoc.json
+      - name: Managed rules
+        href: ../web-application-firewall/afds/waf-front-door-drs.md?toc=%2fazure%2ffrontdoor%2ftoc.json
+      - name: Custom rules
+        href: ../web-application-firewall/afds/waf-front-door-custom-rules.md?toc=%2fazure%2ffrontdoor%2ftoc.json
+      - name: Exclusion lists
+        href: ../web-application-firewall/afds/waf-front-door-exclusion.md?toc=%2fazure%2ffrontdoor%2ftoc.json
+      - name: Policy settings
+        href: ../web-application-firewall/afds/waf-front-door-policy-settings.md?toc=%2fazure%2ffrontdoor%2ftoc.json
+      - name: Geo-filtering
+        href: front-door-geo-filtering.md
   - name: Protocol
     items:
     - name: HTTP/2
@@ -95,13 +107,13 @@
   - name: Secure with Web Application Firewall
     items:
     - name: Configure a security policy
-      href: ../web-application-firewall/afds/waf-front-door-create-portal.md?toc=%2fazure%2ffrontdoor%2fstandard-premium%2ftoc.json
+      href: ../web-application-firewall/afds/waf-front-door-create-portal.md?toc=%2fazure%2ffrontdoor%2ftoc.json
     - name: Configure geo-filtering
       href: front-door-tutorial-geo-filtering.md
     - name: Configure rate limits
-      href: ../web-application-firewall/afds/waf-front-door-rate-limit-powershell.md?toc=%2fazure%2ffrontdoor%2fstandard-premium%2ftoc.json
+      href: ../web-application-firewall/afds/waf-front-door-rate-limit-powershell.md?toc=%2fazure%2ffrontdoor%2ftoc.json
     - name: Configure IP restriction
-      href: ../web-application-firewall/afds/waf-front-door-configure-ip-restriction.md?toc=%2fazure%2ffrontdoor%2fstandard-premium%2ftoc.json
+      href: ../web-application-firewall/afds/waf-front-door-configure-ip-restriction.md?toc=%2fazure%2ffrontdoor%2ftoc.json
   - name: Monitoring
     href: front-door-diagnostics.md
   - name: Troubleshoot

articles/frontdoor/standard-premium/TOC.yml

@@ -39,8 +39,6 @@
     href: ../front-door-health-probes.md?toc=%2fazure%2ffrontdoor%2fstandard-premium%2ftoc.json
   - name: Wildcard domain
     href: ../front-door-wildcard-domain.md?toc=%2fazure%2ffrontdoor%2fstandard-premium%2ftoc.json
-  - name: Geo-filtering
-    href: geo-filtering.md
   - name: Rule Set
     items:
     - name: Rules Engine architecture
@@ -61,6 +59,20 @@
       href: ../concept-end-to-end-tls.md?toc=%2fazure%2ffrontdoor%2fstandard-premium%2ftoc.json
     - name: Private Link
       href: concept-private-link.md
+    - name: Web Application Firewall
+      items:
+      - name: Tuning
+        href: ../../web-application-firewall/afds/waf-front-door-tuning.md?toc=%2fazure%2ffrontdoor%2fstandard-premium%2ftoc.json
+      - name: Managed rules
+        href: ../../web-application-firewall/afds/waf-front-door-drs.md?toc=%2fazure%2ffrontdoor%2fstandard-premium%2ftoc.json
+      - name: Custom rules
+        href: ../../web-application-firewall/afds/waf-front-door-custom-rules.md?toc=%2fazure%2ffrontdoor%2fstandard-premium%2ftoc.json
+      - name: Exclusion lists
+        href: ../../web-application-firewall/afds/waf-front-door-exclusion.md?toc=%2fazure%2ffrontdoor%2fstandard-premium%2ftoc.json
+      - name: Policy settings
+        href: ../../web-application-firewall/afds/waf-front-door-policy-settings.md?toc=%2fazure%2ffrontdoor%2fstandard-premium%2ftoc.json
+      - name: Geo-filtering
+        href: ../front-door-geo-filtering.md?toc=%2fazure%2ffrontdoor%2fstandard-premium%2ftoc.json
   - name: Protocol
     items:
     - name: HTTP/2