From 1d057657ded2e1f952b9863e42a7271a08da7422 Mon Sep 17 00:00:00 2001
From: Johnny Hughes <johnny@centos.org>
Date: May 19 2021 20:54:42 +0000
Subject: CentOS Debranding


---

diff --git a/SOURCES/welcome.conf b/SOURCES/welcome.conf
index 5158e8b..9d91408 100644
--- a/SOURCES/welcome.conf
+++ b/SOURCES/welcome.conf
@@ -7,13 +7,25 @@
 #
 <LocationMatch "^/+$">
     Options -Indexes
-    ErrorDocument 403 /.noindex.html
+    ErrorDocument 403 /noindex/index.html
 </LocationMatch>
 
 <Directory /usr/share/httpd/noindex>
+    Options MultiViews
+    DirectoryIndex index.html
+
+    AddLanguage en-US .en-US
+    AddLanguage es-ES .es-ES
+    AddLanguage zh-CN .zh-CN
+    AddLanguage zh-HK .zh-HK
+    AddLanguage zh-TW .zh-TW
+
+    LanguagePriority en
+    ForceLanguagePriority Fallback
+
     AllowOverride None
     Require all granted
 </Directory>
 
-Alias /.noindex.html /usr/share/httpd/noindex/index.html
-Alias /poweredby.png /usr/share/httpd/icons/apache_pb2.png
\ No newline at end of file
+Alias /noindex /usr/share/httpd/noindex
+Alias /poweredby.png /usr/share/httpd/icons/apache_pb2.png
diff --git a/SPECS/httpd.spec b/SPECS/httpd.spec
index 61148d4..aa0c8e5 100644
--- a/SPECS/httpd.spec
+++ b/SPECS/httpd.spec
@@ -16,6 +16,7 @@ Version: 2.4.37
 Release: 39%{?dist}
 URL: https://httpd.apache.org/
 Source0: https://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2
+Source1: centos-noindex-8.0.tar.gz
 Source2: httpd.logrotate
 Source3: instance.conf
 Source4: httpd-ssl-pass-dialog
@@ -568,8 +569,7 @@ EOF
 
 # Handle contentdir
 mkdir $RPM_BUILD_ROOT%{contentdir}/noindex
-ln -s ../../testpage/index.html \
-      $RPM_BUILD_ROOT%{contentdir}/noindex/index.html
+tar xzf %{SOURCE1} -C $RPM_BUILD_ROOT%{contentdir}/noindex/ --strip-components=1
 rm -rf %{contentdir}/htdocs
 
 # remove manual sources
@@ -783,7 +783,7 @@ rm -rf $RPM_BUILD_ROOT
 %{contentdir}/error/README
 %{contentdir}/error/*.var
 %{contentdir}/error/include/*.html
-%{contentdir}/noindex/index.html
+%{contentdir}/noindex/*
 
 %attr(0710,root,apache) %dir /run/httpd
 %attr(0700,apache,apache) %dir /run/httpd/htcacheclean