From b8c160a1e9136466619b84b229ed79c250e4d212 Mon Sep 17 00:00:00 2001
From: cschanaj <cschanaj@users.noreply.github.com>
Date: Sun, 13 Sep 2020 10:52:58 +0200
Subject: [PATCH 1/2] Rename and update OculusVR.com.xml

---
 src/chrome/content/rules/OculusVR.com.xml | 16 ++++++
 src/chrome/content/rules/Oculus_VR.xml    | 61 -----------------------
 2 files changed, 16 insertions(+), 61 deletions(-)
 create mode 100644 src/chrome/content/rules/OculusVR.com.xml
 delete mode 100644 src/chrome/content/rules/Oculus_VR.xml

diff --git a/src/chrome/content/rules/OculusVR.com.xml b/src/chrome/content/rules/OculusVR.com.xml
new file mode 100644
index 000000000000..d4142f58650f
--- /dev/null
+++ b/src/chrome/content/rules/OculusVR.com.xml
@@ -0,0 +1,16 @@
+<ruleset name="OculusVR.com">
+	<target host="oculusvr.com" />
+	<target host="www.oculusvr.com" />
+	<target host="answers.oculusvr.com" />
+	<target host="careers.oculusvr.com" />
+	<target host="developer.oculusvr.com" />
+	<target host="forums.oculusvr.com" />
+	<target host="share.oculusvr.com" />
+	<target host="static.oculusvr.com" />
+	<target host="storystudio.oculusvr.com" />
+	<target host="www1.oculusvr.com" />
+
+	<securecookie host=".+" name=".+" />
+
+	<rule from="^http:" to="https:" />
+</ruleset>
diff --git a/src/chrome/content/rules/Oculus_VR.xml b/src/chrome/content/rules/Oculus_VR.xml
deleted file mode 100644
index 54b5500667ce..000000000000
--- a/src/chrome/content/rules/Oculus_VR.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-
-<!--
-Disabled by https-everywhere-checker because:
-Fetch error: http://oculusvr.com/ => https://oculusvr.com/: (60, 'SSL certificate problem: unable to get local issuer certificate')
-Fetch error: http://careers.oculusvr.com/ => https://careers.oculusvr.com/: (60, 'SSL certificate problem: unable to get local issuer certificate')
-Fetch error: http://share.oculusvr.com/ => https://share.oculusvr.com/: (6, 'Could not resolve host: share.oculusvr.com')
-Fetch error: http://www.oculusvr.com/ => https://www.oculusvr.com/: (60, 'SSL certificate problem: unable to get local issuer certificate')
-
-	CDN buckets:
-
-		- s3.amazonaws.com/static.oculus.com/
-		- d11g5bl75h7gks.cloudfront.net
-
-
-	Problematic hosts in *oculusvr.com:
-
-		- answers ¹
-		- forums ¹
-		- static ²
-		- storystudio ¹
-		- www1 ¹
-
-	¹ Shows www1.oculus.com
-	² Cloudfront/mismatched
-
--->
-<ruleset name="Oculus VR" default_off="failed ruleset test">
-
-	<!--	Direct rewrites:
-				-->
-	<target host="oculusvr.com" />
-	<target host="careers.oculusvr.com" />
-	<target host="developer.oculusvr.com" />
-	<target host="share.oculusvr.com" />
-	<target host="www.oculusvr.com" />
-
-	<!--	Complications:
-				-->
-	<target host="answers.oculusvr.com" />
-	<target host="forums.oculusvr.com" />
-	<target host="static.oculusvr.com" />
-	<target host="storystudio.oculusvr.com" />
-	<target host="www1.oculusvr.com" />
-
-
-	<securecookie host="^\w" name=".+" />
-
-
-	<!--	Redirect keeps path and args,
-		but not forward slash:
-					-->
-	<rule from="^http://(?:answers|forums|storystudio|www1)\.oculusvr\.com/+"
-		to="https://www.oculus.com/" />
-
-	<rule from="^http://static\.oculusvr\.com/"
-		to="https://d11g5bl75h7gks.cloudfront.net/" />
-
-	<rule from="^http:"
-		to="https:" />
-
-</ruleset>

From 9863b7fa62cd5a073c0fba3d74a586ddc9d2cc20 Mon Sep 17 00:00:00 2001
From: Chan Chak Shing <cschanaj@users.noreply.github.com>
Date: Thu, 8 Oct 2020 14:43:14 +0200
Subject: [PATCH 2/2] Update OculusVR.com.xml

---
 src/chrome/content/rules/OculusVR.com.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/chrome/content/rules/OculusVR.com.xml b/src/chrome/content/rules/OculusVR.com.xml
index d4142f58650f..bd9b0c819d2a 100644
--- a/src/chrome/content/rules/OculusVR.com.xml
+++ b/src/chrome/content/rules/OculusVR.com.xml
@@ -5,9 +5,12 @@
 	<target host="careers.oculusvr.com" />
 	<target host="developer.oculusvr.com" />
 	<target host="forums.oculusvr.com" />
+	<target host="live.oculusvr.com" />
 	<target host="share.oculusvr.com" />
 	<target host="static.oculusvr.com" />
 	<target host="storystudio.oculusvr.com" />
+	<target host="support.oculusvr.com" />
+	<target host="tickets.oculusvr.com" />
 	<target host="www1.oculusvr.com" />
 
 	<securecookie host=".+" name=".+" />