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
14745a07
Commit
14745a07
authored
4 years ago
by
Johnny Hughes
Browse files
Options
Downloads
Patches
Plain Diff
Manual CentOS Debranding
parent
f358ca6a
No related branches found
Branches containing commit
Tags
debrand/c8-stream-2.4/httpd-2.4.37-11.module+el8.0.0+2969+90015743
Tags containing commit
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
.gitignore
+1
-0
1 addition, 0 deletions
.gitignore
.httpd.metadata
+1
-0
1 addition, 0 deletions
.httpd.metadata
SOURCES/welcome.conf
+18
-6
18 additions, 6 deletions
SOURCES/welcome.conf
SPECS/httpd.spec
+3
-4
3 additions, 4 deletions
SPECS/httpd.spec
with
23 additions
and
10 deletions
.gitignore
+
1
−
0
View file @
14745a07
...
...
@@ -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
This diff is collapsed.
Click to expand it.
.httpd.metadata
+
1
−
0
View file @
14745a07
...
...
@@ -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
This diff is collapsed.
Click to expand it.
SOURCES/welcome.conf
+
18
−
6
View file @
14745a07
...
...
@@ -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
>
This diff is collapsed.
Click to expand it.
SPECS/httpd.spec
+
3
−
4
View file @
14745a07
...
...
@@ -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
...
...
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