Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
H
httpd
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
staging
src-rhel
rpms
httpd
Commits
2f74eecf
Commit
2f74eecf
authored
4 years ago
by
Carl George
Browse files
Options
Downloads
Patches
Plain Diff
CentOS debranding
parent
fd48cc58
No related branches found
No related tags found
No related merge requests found
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
.gitignore
+1
-0
1 addition, 0 deletions
.gitignore
.httpd.metadata
+1
-0
1 addition, 0 deletions
.httpd.metadata
README.debrand
+0
-2
0 additions, 2 deletions
README.debrand
SOURCES/welcome.conf
+14
-2
14 additions, 2 deletions
SOURCES/welcome.conf
SPECS/httpd.spec
+3
-7
3 additions, 7 deletions
SPECS/httpd.spec
with
19 additions
and
11 deletions
.gitignore
+
1
−
0
View file @
2f74eecf
SOURCES/httpd-2.4.37.tar.bz2
SOURCES/centos-noindex-8.0.tar.gz
This diff is collapsed.
Click to expand it.
.httpd.metadata
+
1
−
0
View file @
2f74eecf
4a38471de821288b0300148016f2b03dfee8adf2 SOURCES/httpd-2.4.37.tar.bz2
6aa65f45c247226fc922c455e0187abd90c839e8 SOURCES/centos-noindex-8.0.tar.gz
This diff is collapsed.
Click to expand it.
README.debrand
deleted
100644 → 0
+
0
−
2
View file @
fd48cc58
Warning: This package was configured for automatic debranding, but the changes
failed to apply.
This diff is collapsed.
Click to expand it.
SOURCES/welcome.conf
+
14
−
2
View file @
2f74eecf
...
...
@@ -7,12 +7,24 @@
#
<
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
/
noindex
/
usr
/
share
/
httpd
/
noindex
This diff is collapsed.
Click to expand it.
SPECS/httpd.spec
+
3
−
7
View file @
2f74eecf
...
...
@@ -16,7 +16,7 @@ Version: 2.4.37
Release: 30%{?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
...
...
@@ -530,8 +530,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
...
...
@@ -745,7 +744,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
...
...
@@ -829,9 +828,6 @@ rm -rf $RPM_BUILD_ROOT
%{_rpmconfigdir}/macros.d/macros.httpd
%changelog
* Tue Nov 03 2020 CentOS Sources <bugs@centos.org> - 2.4.37-30.el8.centos
- Apply debranding changes
* Mon Jun 15 2020 Joe Orton <jorton@redhat.com> - 2.4.37-30
- Resolves: #1209162 - support logging to journald from CustomLog
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment