metalefty/nginx
1
0
Fork 0
forked from rpms/nginx
Code Pull Requests Activity

Resolves: #2007019 - use proper wording in error pages

Browse Source
This commit is contained in:
Luboš Uhliarik 2021-09-23 00:28:41 +02:00
parent 1365117847
commit af7c1c8756
3 changed files with 26 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
404.html
View File

@ -27,7 +27,7 @@
text-align: center; text-align: center;
margin: 0; margin: 0;
padding: 0.6em 2em 0.4em; padding: 0.6em 2em 0.4em;
background-color: #294172; background-color: #900;
color: #fff; color: #fff;
font-weight: normal; font-weight: normal;
font-size: 1.75em; font-size: 1.75em;
@ -39,13 +39,13 @@
} }
h2 { h2 {
text-align: center; text-align: center;
background-color: #3C6EB4; background-color: #900;
font-size: 1.1em; font-size: 1.1em;
font-weight: bold; font-weight: bold;
color: #fff; color: #fff;
margin: 0; margin: 0;
padding: 0.5em; padding: 0.5em;
border-bottom: 2px solid #294172; border-bottom: 2px solid #000;
} }
h3 { h3 {
text-align: center; text-align: center;
@ -92,7 +92,7 @@
<p>Something has triggered missing webpage on your <p>Something has triggered missing webpage on your
website. This is the default 404 error page for website. This is the default 404 error page for
<strong>nginx</strong> that is distributed with <strong>nginx</strong> that is distributed with
Fedora. It is located Red Hat Enterprise Linux. It is located
<tt>/usr/share/nginx/html/404.html</tt></p> <tt>/usr/share/nginx/html/404.html</tt></p>
<p>You should customize this error page for your own <p>You should customize this error page for your own
@ -100,18 +100,19 @@
the <strong>nginx</strong> configuration file the <strong>nginx</strong> configuration file
<tt>/etc/nginx/nginx.conf</tt>.</p> <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> </div>
<div class="logos"> <div class="logos">
<a href="http://nginx.net/"><img <a href="http://nginx.net/"><img
src="/nginx-logo.png" src="nginx-logo.png"
alt="[ Powered by nginx ]" alt="[ Powered by nginx ]"
width="121" height="32" /></a> width="121" height="32" /></a>
<a href="http://www.redhat.com/"><img
<a href="http://fedoraproject.org/"><img src="poweredby.png"
src="/poweredby.png" alt="[ Powered by Red Hat Enterprise Linux ]"
alt="[ Powered by Fedora ]"
width="88" height="31" /></a> width="88" height="31" /></a>
</div> </div>
</div> </div>

21
50x.html
View File

@ -27,7 +27,7 @@
text-align: center; text-align: center;
margin: 0; margin: 0;
padding: 0.6em 2em 0.4em; padding: 0.6em 2em 0.4em;
background-color: #294172; background-color: #900;
color: #fff; color: #fff;
font-weight: normal; font-weight: normal;
font-size: 1.75em; font-size: 1.75em;
@ -39,13 +39,13 @@
} }
h2 { h2 {
text-align: center; text-align: center;
background-color: #3C6EB4; background-color: #900;
font-size: 1.1em; font-size: 1.1em;
font-weight: bold; font-weight: bold;
color: #fff; color: #fff;
margin: 0; margin: 0;
padding: 0.5em; padding: 0.5em;
border-bottom: 2px solid #294172; border-bottom: 2px solid #000;
} }
h3 { h3 {
text-align: center; text-align: center;
@ -89,10 +89,10 @@
<div class="alert"> <div class="alert">
<h2>Website Administrator</h2> <h2>Website Administrator</h2>
<div class="content"> <div class="content">
<p>Something has triggered an error on your <p>Something has triggered missing webpage on your
website. This is the default error page for website. This is the default error page for
<strong>nginx</strong> that is distributed with <strong>nginx</strong> that is distributed with
Fedora. It is located Red Hat Enterprise Linux. It is located
<tt>/usr/share/nginx/html/50x.html</tt></p> <tt>/usr/share/nginx/html/50x.html</tt></p>
<p>You should customize this error page for your own <p>You should customize this error page for your own
@ -100,18 +100,19 @@
the <strong>nginx</strong> configuration file the <strong>nginx</strong> configuration file
<tt>/etc/nginx/nginx.conf</tt>.</p> <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> </div>
<div class="logos"> <div class="logos">
<a href="http://nginx.net/"><img <a href="http://nginx.net/"><img
src="/nginx-logo.png" src="nginx-logo.png"
alt="[ Powered by nginx ]" alt="[ Powered by nginx ]"
width="121" height="32" /></a> width="121" height="32" /></a>
<a href="http://www.redhat.com/"><img
<a href="http://fedoraproject.org/"><img src="poweredby.png"
src="/poweredby.png" alt="[ Powered by Red Hat Enterprise Linux ]"
alt="[ Powered by Fedora ]"
width="88" height="31" /></a> width="88" height="31" /></a>
</div> </div>
</div> </div>

5
nginx.spec
View File

@ -41,7 +41,7 @@
Name: nginx Name: nginx
Epoch: 1 Epoch: 1
Version: 1.20.1 Version: 1.20.1
Release: 7%{?dist} Release: 8%{?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)
@ -584,6 +584,9 @@ fi
%changelog %changelog
* Wed Sep 22 2021 Luboš Uhliarik <luhliari@redhat.com> - 1:1.20.1-8
- Resolves: #2007019 - use proper wording in error pages
* Wed Sep 22 2021 Luboš Uhliarik <luhliari@redhat.com> - 1:1.20.1-7 * Wed Sep 22 2021 Luboš Uhliarik <luhliari@redhat.com> - 1:1.20.1-7
- Resolves: #2006420 - Broken loading certificates from hardware token (PKCS#11) - Resolves: #2006420 - Broken loading certificates from hardware token (PKCS#11)