Move to common default index.html
Resolves: rhbz#1636235 Signed-off-by: Stephen Gallagher <sgallagh@redhat.com>
This commit is contained in:
Stephen Gallagher
parent
078d1528aa
commit
8e14a8bd23
116
index.html
116
index.html
@ -1,116 +0,0 @@
|
|||||||
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
|
|
||||||
|
|
||||||
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
|
|
||||||
<head>
|
|
||||||
<title>Test Page for the Nginx HTTP Server on Fedora</title>
|
|
||||||
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
|
|
||||||
<style type="text/css">
|
|
||||||
/*<![CDATA[*/
|
|
||||||
body {
|
|
||||||
background-color: #fff;
|
|
||||||
color: #000;
|
|
||||||
font-size: 0.9em;
|
|
||||||
font-family: sans-serif,helvetica;
|
|
||||||
margin: 0;
|
|
||||||
padding: 0;
|
|
||||||
}
|
|
||||||
:link {
|
|
||||||
color: #c00;
|
|
||||||
}
|
|
||||||
:visited {
|
|
||||||
color: #c00;
|
|
||||||
}
|
|
||||||
a:hover {
|
|
||||||
color: #f50;
|
|
||||||
}
|
|
||||||
h1 {
|
|
||||||
text-align: center;
|
|
||||||
margin: 0;
|
|
||||||
padding: 0.6em 2em 0.4em;
|
|
||||||
background-color: #294172;
|
|
||||||
color: #fff;
|
|
||||||
font-weight: normal;
|
|
||||||
font-size: 1.75em;
|
|
||||||
border-bottom: 2px solid #000;
|
|
||||||
}
|
|
||||||
h1 strong {
|
|
||||||
font-weight: bold;
|
|
||||||
font-size: 1.5em;
|
|
||||||
}
|
|
||||||
h2 {
|
|
||||||
text-align: center;
|
|
||||||
background-color: #3C6EB4;
|
|
||||||
font-size: 1.1em;
|
|
||||||
font-weight: bold;
|
|
||||||
color: #fff;
|
|
||||||
margin: 0;
|
|
||||||
padding: 0.5em;
|
|
||||||
border-bottom: 2px solid #294172;
|
|
||||||
}
|
|
||||||
hr {
|
|
||||||
display: none;
|
|
||||||
}
|
|
||||||
.content {
|
|
||||||
padding: 1em 5em;
|
|
||||||
}
|
|
||||||
.alert {
|
|
||||||
border: 2px solid #000;
|
|
||||||
}
|
|
||||||
|
|
||||||
img {
|
|
||||||
border: 2px solid #fff;
|
|
||||||
padding: 2px;
|
|
||||||
margin: 2px;
|
|
||||||
}
|
|
||||||
a:hover img {
|
|
||||||
border: 2px solid #294172;
|
|
||||||
}
|
|
||||||
.logos {
|
|
||||||
margin: 1em;
|
|
||||||
text-align: center;
|
|
||||||
}
|
|
||||||
/*]]>*/
|
|
||||||
</style>
|
|
||||||
</head>
|
|
||||||
|
|
||||||
<body>
|
|
||||||
<h1>Welcome to <strong>nginx</strong> on Fedora!</h1>
|
|
||||||
|
|
||||||
<div class="content">
|
|
||||||
<p>This page is used to test the proper operation of the
|
|
||||||
<strong>nginx</strong> HTTP server after it has been
|
|
||||||
installed. If you can read this page, it means that the
|
|
||||||
web server installed at this site is working
|
|
||||||
properly.</p>
|
|
||||||
|
|
||||||
<div class="alert">
|
|
||||||
<h2>Website Administrator</h2>
|
|
||||||
<div class="content">
|
|
||||||
<p>This is the default <tt>index.html</tt> page that
|
|
||||||
is distributed with <strong>nginx</strong> on
|
|
||||||
Fedora. It is located in
|
|
||||||
<tt>/usr/share/nginx/html</tt>.</p>
|
|
||||||
|
|
||||||
<p>You should now put your content in a location of
|
|
||||||
your choice and edit the <tt>root</tt> configuration
|
|
||||||
directive in the <strong>nginx</strong>
|
|
||||||
configuration file
|
|
||||||
<tt>/etc/nginx/nginx.conf</tt>.</p>
|
|
||||||
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="logos">
|
|
||||||
<a href="http://nginx.net/"><img
|
|
||||||
src="nginx-logo.png"
|
|
||||||
alt="[ Powered by nginx ]"
|
|
||||||
width="121" height="32" /></a>
|
|
||||||
|
|
||||||
<a href="http://fedoraproject.org/"><img
|
|
||||||
src="poweredby.png"
|
|
||||||
alt="[ Powered by Fedora ]"
|
|
||||||
width="88" height="31" /></a>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</body>
|
|
||||||
</html>
|
|
||||||
24
nginx.spec
24
nginx.spec
@ -23,7 +23,7 @@
|
|||||||
Name: nginx
|
Name: nginx
|
||||||
Epoch: 1
|
Epoch: 1
|
||||||
Version: 1.16.0
|
Version: 1.16.0
|
||||||
Release: 2%{?dist}
|
Release: 3%{?dist}
|
||||||
|
|
||||||
Summary: A high performance web server and reverse proxy server
|
Summary: A high performance web server and reverse proxy server
|
||||||
# BSD License (two clause)
|
# BSD License (two clause)
|
||||||
@ -37,8 +37,6 @@ Source11: nginx.logrotate
|
|||||||
Source12: nginx.conf
|
Source12: nginx.conf
|
||||||
Source13: nginx-upgrade
|
Source13: nginx-upgrade
|
||||||
Source14: nginx-upgrade.8
|
Source14: nginx-upgrade.8
|
||||||
Source100: index.html
|
|
||||||
Source101: poweredby.png
|
|
||||||
Source102: nginx-logo.png
|
Source102: nginx-logo.png
|
||||||
Source103: 404.html
|
Source103: 404.html
|
||||||
Source104: 50x.html
|
Source104: 50x.html
|
||||||
@ -62,6 +60,7 @@ BuildRequires: pcre-devel
|
|||||||
BuildRequires: zlib-devel
|
BuildRequires: zlib-devel
|
||||||
|
|
||||||
Requires: nginx-filesystem = %{epoch}:%{version}-%{release}
|
Requires: nginx-filesystem = %{epoch}:%{version}-%{release}
|
||||||
|
Requires: system-logos-httpd
|
||||||
|
|
||||||
%if 0%{?rhel} > 0 && 0%{?rhel} < 8
|
%if 0%{?rhel} > 0 && 0%{?rhel} < 8
|
||||||
# Introduced at 1:1.10.0-1 to ease upgrade path. To be removed later.
|
# Introduced at 1:1.10.0-1 to ease upgrade path. To be removed later.
|
||||||
@ -281,10 +280,19 @@ install -p -d -m 0755 %{buildroot}%{_libdir}/nginx/modules
|
|||||||
|
|
||||||
install -p -m 0644 ./nginx.conf \
|
install -p -m 0644 ./nginx.conf \
|
||||||
%{buildroot}%{_sysconfdir}/nginx
|
%{buildroot}%{_sysconfdir}/nginx
|
||||||
install -p -m 0644 %{SOURCE100} \
|
|
||||||
%{buildroot}%{_datadir}/nginx/html
|
rm -f %{buildroot}%{_datadir}/nginx/html/index.html
|
||||||
install -p -m 0644 %{SOURCE101} %{SOURCE102} \
|
ln -s ../../fedora-testpage/index.html \
|
||||||
|
%{buildroot}%{_datadir}/nginx/html/index.html
|
||||||
|
install -p -m 0644 %{SOURCE102} \
|
||||||
%{buildroot}%{_datadir}/nginx/html
|
%{buildroot}%{_datadir}/nginx/html
|
||||||
|
ln -s nginx-logo.png %{buildroot}%{_datadir}/nginx/html/poweredby.png
|
||||||
|
mkdir -p %{buildroot}%{_datadir}/nginx/html/icons
|
||||||
|
|
||||||
|
# Symlink for the powered-by-$DISTRO image:
|
||||||
|
ln -s ../../../pixmaps/poweredby.png \
|
||||||
|
%{buildroot}%{_datadir}/nginx/html/icons/poweredby.png
|
||||||
|
|
||||||
install -p -m 0644 %{SOURCE103} %{SOURCE104} \
|
install -p -m 0644 %{SOURCE103} %{SOURCE104} \
|
||||||
%{buildroot}%{_datadir}/nginx/html
|
%{buildroot}%{_datadir}/nginx/html
|
||||||
|
|
||||||
@ -451,6 +459,10 @@ fi
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue May 14 2019 Stephen Gallagher <sgallagh@redhat.com> - 1.16.0-3
|
||||||
|
- Move to common default index.html
|
||||||
|
- Resolves: rhbz#1636235
|
||||||
|
|
||||||
* Tue May 07 2019 Jamie Nguyen <jamielinux@fedoraproject.org> - 1:1.16.0-2
|
* Tue May 07 2019 Jamie Nguyen <jamielinux@fedoraproject.org> - 1:1.16.0-2
|
||||||
- Add missing directory for vim plugin
|
- Add missing directory for vim plugin
|
||||||
|
|
||||||
|
|||||||
BIN
poweredby.png
BIN
poweredby.png
Binary file not shown.
|
Before Width: | Height: | Size: 2.7 KiB |
Loading…
Reference in New Issue
Block a user