Merge branch 'feature/SRL-658-remove-revoked-forms-from-sitemapxml-an…

…d-block-in-robotstxt' into deployment/20220831-bis

composer.json

@@ -265,7 +265,8 @@
  "patch -p1 < patches/robots-6.patch",
  "patch -p1 < patches/robots-7.patch",
  "patch -p1 < patches/robots-8.patch",
- "patch -p1 < patches/robots-9.patch"
+ "patch -p1 < patches/robots-9.patch",
+ "patch -p1 < patches/robots-10.patch"
  ],
  "build-assets": [
  "@prepare-for-pantheon",

patches/robots-10.patch

@@ -0,0 +1,46 @@
+diff --git a/web/robots.txt b/web/robots.txt
+index 2cc8f4f4..0a450bf1 100644
+--- a/web/robots.txt
++++ b/web/robots.txt
+@@ -482,7 +482,6 @@ Allow: /jcc-form/CH-730
+ Allow: /jcc-form/CH-800
+ Allow: /jcc-form/CH-800-INFO
+ Allow: /jcc-form/CIV-010
+-Allow: /jcc-form/CIV-020
+ Allow: /jcc-form/CIV-025
+ Allow: /jcc-form/CIV-050
+ Allow: /jcc-form/CIV-090
+@@ -994,8 +993,6 @@ Allow: /jcc-form/FL-676
+ Allow: /jcc-form/FL-676-INFO
+ Allow: /jcc-form/FL-677
+ Allow: /jcc-form/FL-678
+-Allow: /jcc-form/FL-679
+-Allow: /jcc-form/FL-679-INFO
+ Allow: /jcc-form/FL-680
+ Allow: /jcc-form/FL-681
+ Allow: /jcc-form/FL-683
+@@ -1771,9 +1768,6 @@ Allow: /jcc-form/TR-310
+ Allow: /jcc-form/TR-310 o
+ Allow: /jcc-form/TR-320
+ Allow: /jcc-form/TR-321
+-Allow: /jcc-form/TR-500-INFO
+-Allow: /jcc-form/TR-505
+-Allow: /jcc-form/TR-510
+ Allow: /jcc-form/UD-100
+ Allow: /jcc-form/UD-101
+ Allow: /jcc-form/UD-104
+@@ -2069,6 +2063,14 @@ Allow: /es/cambie-su-nombre-cuando-se-casa
+ Allow: /es/cambie-su-nombre-en-california
+ # Update Robots.txt after custom sitemap 08 01 2022
+ Allow: /sitemap.xml
++# Update to block revoked forms
++Disallow: /jcc-form/CIV-020
++Disallow: /jcc-form/CR-174
++Disallow: /jcc-form/FL-679
++Disallow: /jcc-form/FL-679-INFO
++Disallow: /jcc-form/TR-500-INFO
++Disallow: /jcc-form/TR-505
++Disallow: /jcc-form/TR-510
+ # Directories
+ Disallow: /core/
+ Disallow: /profiles/

web/robots.txt

@@ -482,7 +482,6 @@ Allow: /jcc-form/CH-730
 Allow: /jcc-form/CH-800
 Allow: /jcc-form/CH-800-INFO
 Allow: /jcc-form/CIV-010
-Allow: /jcc-form/CIV-020
 Allow: /jcc-form/CIV-025
 Allow: /jcc-form/CIV-050
 Allow: /jcc-form/CIV-090
@@ -994,8 +993,6 @@ Allow: /jcc-form/FL-676
 Allow: /jcc-form/FL-676-INFO
 Allow: /jcc-form/FL-677
 Allow: /jcc-form/FL-678
-Allow: /jcc-form/FL-679
-Allow: /jcc-form/FL-679-INFO
 Allow: /jcc-form/FL-680
 Allow: /jcc-form/FL-681
 Allow: /jcc-form/FL-683
@@ -1771,9 +1768,6 @@ Allow: /jcc-form/TR-310
 Allow: /jcc-form/TR-310 o
 Allow: /jcc-form/TR-320
 Allow: /jcc-form/TR-321
-Allow: /jcc-form/TR-500-INFO
-Allow: /jcc-form/TR-505
-Allow: /jcc-form/TR-510
 Allow: /jcc-form/UD-100
 Allow: /jcc-form/UD-101
 Allow: /jcc-form/UD-104
@@ -2069,6 +2063,14 @@ Allow: /es/cambie-su-nombre-cuando-se-casa
 Allow: /es/cambie-su-nombre-en-california
 # Update Robots.txt after custom sitemap 08 01 2022
 Allow: /sitemap.xml
+# Update to block revoked forms
+Disallow: /jcc-form/CIV-020
+Disallow: /jcc-form/CR-174
+Disallow: /jcc-form/FL-679
+Disallow: /jcc-form/FL-679-INFO
+Disallow: /jcc-form/TR-500-INFO
+Disallow: /jcc-form/TR-505
+Disallow: /jcc-form/TR-510
 # Directories
 Disallow: /core/
 Disallow: /profiles/