Skip to content
Snippets Groups Projects
Commit 14745a07 authored by Johnny Hughes's avatar Johnny Hughes
Browse files

Manual CentOS Debranding

parent f358ca6a
No related branches found
No related merge requests found
......@@ -2,3 +2,4 @@ SOURCES/htcacheclean.service.xml
SOURCES/httpd-2.4.37.tar.bz2
SOURCES/httpd.conf.xml
SOURCES/httpd.service.xml
SOURCES/centos-noindex-8.0.tar.gz
......@@ -2,3 +2,4 @@ a34c31169efbe6140496c37801489610461bdf9b SOURCES/htcacheclean.service.xml
4a38471de821288b0300148016f2b03dfee8adf2 SOURCES/httpd-2.4.37.tar.bz2
fa18caadd0afbddc2c7a7fc404bf4f2b41867148 SOURCES/httpd.conf.xml
888df830bdc465de3bced6f075c33380018e544f SOURCES/httpd.service.xml
6aa65f45c247226fc922c455e0187abd90c839e8 SOURCES/centos-noindex-8.0.tar.gz
......@@ -6,13 +6,25 @@
# NOTE: if this file is removed, it will be restored on upgrades.
#
<LocationMatch "^/+$">
Options -Indexes
ErrorDocument 403 /.noindex.html
Options -Indexes
ErrorDocument 403 /noindex/index.html
</LocationMatch>
Alias /noindex /usr/share/httpd/noindex
<Directory /usr/share/httpd/noindex>
AllowOverride None
Require all granted
</Directory>
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
Alias /.noindex.html /usr/share/httpd/noindex/index.html
LanguagePriority en
ForceLanguagePriority Fallback
AllowOverride None
Require all granted
</Directory>
......@@ -16,7 +16,7 @@ Version: 2.4.37
Release: 21%{?dist}
URL: https://httpd.apache.org/
Source0: https://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2
Source1: index.html
Source1: centos-noindex-8.0.tar.gz
Source2: httpd.logrotate
Source3: instance.conf
Source4: httpd-ssl-pass-dialog
......@@ -504,8 +504,7 @@ EOF
# Handle contentdir
mkdir $RPM_BUILD_ROOT%{contentdir}/noindex
install -m 644 -p $RPM_SOURCE_DIR/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
......@@ -719,7 +718,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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment