From 8c08392f60a8d4651bb53b8f83cd024fb90c9653 Mon Sep 17 00:00:00 2001 From: Stephen Gallagher Date: Tue, 14 May 2019 10:55:19 -0400 Subject: [PATCH] Use testpage from system-logos-httpd for proper branding Signed-off-by: Stephen Gallagher --- httpd.spec | 10 ++-- index.html | 132 --------------------------------------------------- welcome.conf | 1 + 3 files changed, 7 insertions(+), 136 deletions(-) delete mode 100644 index.html diff --git a/httpd.spec b/httpd.spec index ed18bf1..043b593 100644 --- a/httpd.spec +++ b/httpd.spec @@ -13,10 +13,9 @@ Summary: Apache HTTP Server Name: httpd Version: 2.4.41 -Release: 1%{?dist} +Release: 2%{?dist} URL: https://httpd.apache.org/ Source0: https://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2 -Source1: index.html Source2: httpd.logrotate Source3: instance.conf Source4: httpd-ssl-pass-dialog @@ -428,8 +427,8 @@ EOF # Handle contentdir mkdir $RPM_BUILD_ROOT%{contentdir}/noindex \ $RPM_BUILD_ROOT%{contentdir}/server-status -install -m 644 -p $RPM_SOURCE_DIR/index.html \ - $RPM_BUILD_ROOT%{contentdir}/noindex/index.html +ln -s ../../fedora-testpage/index.html \ + $RPM_BUILD_ROOT%{contentdir}/noindex/index.html install -m 644 -p docs/server-status/* \ $RPM_BUILD_ROOT%{contentdir}/server-status rm -rf %{contentdir}/htdocs @@ -741,6 +740,9 @@ exit $rv %{_rpmconfigdir}/macros.d/macros.httpd %changelog +* Thu Sep 19 2019 Stephen Gallagher - 2.4.41-2 +- Use testpage from system-logos-httpd for proper branding + * Thu Aug 15 2019 Joe Orton - 2.4.41-1 - update to 2.4.41 diff --git a/index.html b/index.html deleted file mode 100644 index 1b7ea03..0000000 --- a/index.html +++ /dev/null @@ -1,132 +0,0 @@ - - - - - Test Page for the Apache HTTP Server on Fedora - - - - - -

Fedora Test Page

- -
-
-

This page is used to test the proper operation of the Apache 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, but has not yet been configured.

-
-
- -
-
-

If you are a member of the general public:

- -

The fact that you are seeing this page indicates that the website you just visited is either experiencing problems, or is undergoing routine maintenance.

- -

If you would like to let the administrators of this website know that you've seen this page instead of the page you expected, you should send them e-mail. In general, mail sent to the name "webmaster" and directed to the website's domain should reach the appropriate person.

- -

For example, if you experienced problems while visiting www.example.com, you should send e-mail to "webmaster@example.com".

- -

Fedora is a distribution of Linux, a popular computer operating system. It is commonly used by hosting companies because it is free, and includes free web server software. Many times, they do not set up their web server correctly, and it displays this "test page" instead of the expected website.

- -

Accordingly, please keep these facts in mind:

-
    -
  • Neither the Fedora Project or Red Hat has any affiliation with any website or content hosted from this server (unless otherwise explicitly stated).
    • -
  • Neither the Fedora Project or Red Hat has "hacked" this webserver, this test page is an included component of Apache's httpd webserver software.
    • -
- -

For more information about Fedora, please visit the Fedora Project website.

-
-
- -
-

If you are the website administrator:

- -

You may now add content to the directory /var/www/html/. Note that until you do so, people visiting your website will see this page, and not your content. To prevent this page from ever being used, follow the instructions in the file /etc/httpd/conf.d/welcome.conf.

- -
-

You are free to use the images below on Apache and Fedora powered HTTP servers. Thanks for using Apache and Fedora!

- -

[ Powered by Apache ] [ Powered by Fedora ]

-
-
-
-
- - diff --git a/welcome.conf b/welcome.conf index 5d1e452..b279c2f 100644 --- a/welcome.conf +++ b/welcome.conf @@ -16,3 +16,4 @@ Alias /.noindex.html /usr/share/httpd/noindex/index.html +Alias /poweredby.png /usr/share/httpd/icons/apache_pb2.png