diff --git a/.gitignore b/.gitignore
index 4dfd66f..754578d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1 @@
SOURCES/nginx-1.18.0.tar.gz
-SOURCES/poweredby.png
diff --git a/.nginx.metadata b/.nginx.metadata
index e483707..6bc3c65 100644
--- a/.nginx.metadata
+++ b/.nginx.metadata
@@ -1,2 +1 @@
47b2c5ccd12e2a7088b03d629ff6b9ab18215180 SOURCES/nginx-1.18.0.tar.gz
-2ec82988cd0d9b1304c95a16b28eff70f0f69abc SOURCES/poweredby.png
diff --git a/SOURCES/index.html b/SOURCES/index.html
deleted file mode 100644
index 7756222..0000000
--- a/SOURCES/index.html
+++ /dev/null
@@ -1,117 +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 Red Hat Enterprise Linux</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: #900;
- 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: #900;
- font-size: 1.1em;
- font-weight: bold;
- color: #fff;
- margin: 0;
- padding: 0.5em;
- border-bottom: 2px solid #000;
- }
- 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 Red Hat Enterprise Linux!</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
- Red Hat Enterprise Linux. 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>
-
- <p>For information on Red Hat Enterprise Linux, please visit the <a href="http://www.redhat.com/">Red Hat, Inc. website</a>. The documentation for Red Hat Enterprise Linux is <a href="http://www.redhat.com/docs/manuals/enterprise/">available on the Red Hat, Inc. website</a>.</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://www.redhat.com/"><img
- src="poweredby.png"
- alt="[ Powered by Red Hat Enterprise Linux ]"
- width="88" height="31" /></a>
- </div>
- </div>
- </body>
-</html>
diff --git a/SPECS/nginx.spec b/SPECS/nginx.spec
index 04a67c7..1a98009 100644
--- a/SPECS/nginx.spec
+++ b/SPECS/nginx.spec
@@ -19,7 +19,7 @@
Name: nginx
Epoch: 1
Version: 1.18.0
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: A high performance web server and reverse proxy server
Group: System Environment/Daemons
@@ -34,8 +34,6 @@ Source11: nginx.logrotate
Source12: nginx.conf
Source13: nginx-upgrade
Source14: nginx-upgrade.8
-Source100: index.html
-Source101: poweredby.png
Source102: nginx-logo.png
Source103: 404.html
Source104: 50x.html
@@ -70,6 +68,7 @@ BuildRequires: pcre-devel
BuildRequires: zlib-devel
Requires: nginx-filesystem = %{epoch}:%{version}-%{release}
+Requires: system-logos-httpd >= 82.0
%if 0%{?rhel} > 0 && 0%{?rhel} < 8
# Introduced at 1:1.10.0-1 to ease upgrade path. To be removed later.
@@ -296,10 +295,19 @@ install -p -d -m 0755 %{buildroot}%{_libdir}/nginx/modules
install -p -m 0644 ./nginx.conf \
%{buildroot}%{_sysconfdir}/nginx
-install -p -m 0644 %{SOURCE100} \
- %{buildroot}%{_datadir}/nginx/html
-install -p -m 0644 %{SOURCE101} %{SOURCE102} \
+
+rm -f %{buildroot}%{_datadir}/nginx/html/index.html
+ln -s ../../testpage/index.html \
+ %{buildroot}%{_datadir}/nginx/html/index.html
+install -p -m 0644 %{SOURCE102} \
%{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} \
%{buildroot}%{_datadir}/nginx/html
@@ -465,6 +473,10 @@ fi
%changelog
+* Thu Nov 12 2020 Lubos Uhliarik <luhliari@redhat.com> - 1:1.18.0-3
+- Resolves: #1651377 - centralizing default index.html on nginx
+- Resolves: #1825683 - Outdated Red Hat branding used in nginx default pages
+
* Wed Apr 22 2020 Lubos Uhliarik <luhliari@redhat.com> - 1:1.18.0-2
- new version 1.18.0
- Resolves: #1668717 - [RFE] Support loading certificates from hardware token