From 8e14a8bd2363b55e278f5cdc29cae5c634cdd834 Mon Sep 17 00:00:00 2001 From: Stephen Gallagher Date: Tue, 14 May 2019 14:58:45 -0400 Subject: [PATCH] Move to common default index.html Resolves: rhbz#1636235 Signed-off-by: Stephen Gallagher --- index.html | 116 -------------------------------------------------- nginx.spec | 24 ++++++++--- poweredby.png | Bin 2811 -> 0 bytes 3 files changed, 18 insertions(+), 122 deletions(-) delete mode 100644 index.html delete mode 100644 poweredby.png diff --git a/index.html b/index.html deleted file mode 100644 index dea2265..0000000 --- a/index.html +++ /dev/null @@ -1,116 +0,0 @@ - - - - - Test Page for the Nginx HTTP Server on Fedora - - - - - -

Welcome to nginx on Fedora!

- -
-

This page is used to test the proper operation of the - nginx 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.

- -
-

Website Administrator

-
-

This is the default index.html page that - is distributed with nginx on - Fedora. It is located in - /usr/share/nginx/html.

- -

You should now put your content in a location of - your choice and edit the root configuration - directive in the nginx - configuration file - /etc/nginx/nginx.conf.

- -
-
- -
- [ Powered by nginx ] - - [ Powered by Fedora ] -
-
- - diff --git a/nginx.spec b/nginx.spec index 4630948..589d326 100644 --- a/nginx.spec +++ b/nginx.spec @@ -23,7 +23,7 @@ Name: nginx Epoch: 1 Version: 1.16.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A high performance web server and reverse proxy server # BSD License (two clause) @@ -37,8 +37,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 @@ -62,6 +60,7 @@ BuildRequires: pcre-devel BuildRequires: zlib-devel Requires: nginx-filesystem = %{epoch}:%{version}-%{release} +Requires: system-logos-httpd %if 0%{?rhel} > 0 && 0%{?rhel} < 8 # 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 \ %{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 ../../fedora-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 @@ -451,6 +459,10 @@ fi %changelog +* Tue May 14 2019 Stephen Gallagher - 1.16.0-3 +- Move to common default index.html +- Resolves: rhbz#1636235 + * Tue May 07 2019 Jamie Nguyen - 1:1.16.0-2 - Add missing directory for vim plugin diff --git a/poweredby.png b/poweredby.png deleted file mode 100644 index b4aea88b9f33b00727d91327089a33d620ac3c32..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2811 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 N002ovPDHLkV1nUENR