From 25729938c09fa024e37e8bcbd589854b46ef6794 Mon Sep 17 00:00:00 2001
From: Thierry Carrez <thierry@openstack.org>
Date: Mon, 3 Aug 2020 16:41:16 +0200
Subject: [PATCH] Redirect UC content to TC site

The UC and TC merged on August 1, 2020. A separate website at
https://governance.openstack.org/uc/ is no longer required, and
its content is now obsolete.

Redirect all /uc/* requests to https://governance.openstack.org/tc/
index page so that we don't break anyone.

Depends-On: https://review.opendev.org/744488
Change-Id: I38b6a41eee81e2bca47a4f6d81ee30fe54f3199e
---
 .../static/files/50-governance.openstack.org.conf     | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/playbooks/roles/static/files/50-governance.openstack.org.conf b/playbooks/roles/static/files/50-governance.openstack.org.conf
index 7c76f8b1b7..8fcfaa9757 100644
--- a/playbooks/roles/static/files/50-governance.openstack.org.conf
+++ b/playbooks/roles/static/files/50-governance.openstack.org.conf
@@ -30,7 +30,6 @@ Define AFS_ROOT /afs/openstack.org/project/governance.openstack.org
   Alias "/ideas/" "${AFS_ROOT}/ideas/"
   Alias "/sigs/" "${AFS_ROOT}/sigs/"
   Alias "/tc/" "${AFS_ROOT}/tc/"
-  Alias "/uc/" "${AFS_ROOT}/uc/"
   # keep last
   Alias "/" "${AFS_ROOT}/governance/"
 
@@ -40,6 +39,9 @@ Define AFS_ROOT /afs/openstack.org/project/governance.openstack.org
   Redirect "/reference/" "/tc/reference/"
   Redirect "/resolutions/" "/tc/resolutions/"
 
+  # Redirect all old pages under /uc/ to the TC index page
+  RedirectMatch "^/uc/.*$" "/tc/index.html"
+
   <Directory ${AFS_ROOT}/election>
     Options Indexes FollowSymLinks MultiViews
     AllowOverrideList Redirect RedirectMatch
@@ -75,13 +77,6 @@ Define AFS_ROOT /afs/openstack.org/project/governance.openstack.org
     Require all granted
   </Directory>
 
-  <Directory ${AFS_ROOT}/uc>
-    Options Indexes FollowSymLinks MultiViews
-    AllowOverrideList Redirect RedirectMatch
-    Satisfy Any
-    Require all granted
-  </Directory>
-
   <Directory ${AFS_ROOT}/badges>
     Options Indexes FollowSymLinks MultiViews
     AllowOverride None