From a5f19035f9e31b61af85281636445ebb2b4c6a71 Mon Sep 17 00:00:00 2001 From: Máirín Duffy Date: Mar 11 2021 15:29:26 +0000 Subject: [PATCH 1/2] New default HTML page & powered by logo Updating the powered by Fedora logo to the new Fedora logo. Giving the default web server html a facelift along with the new logo. Updating trademark acknowledgment for Apache, nginx, and Caddy webserver trademarks / logos which may appear on this page depending on what the user is running. Adding Caddy setup instructions. Reference: https://pagure.io/design/issue/732 New page design developed with the help of Outreachy applicant Somya Upadhyay, thank you! Signed-off-by: Máirín Duffy --- diff --git a/pixmaps/poweredby.png b/pixmaps/poweredby.png index 57de69c..da434f0 100644 Binary files a/pixmaps/poweredby.png and b/pixmaps/poweredby.png differ diff --git a/testpage/index.html b/testpage/index.html index 555e9fd..e269a16 100644 --- a/testpage/index.html +++ b/testpage/index.html @@ -1,127 +1,261 @@ - + + + + + + Test Page for the HTTP Server on Fedora + - - - -

Fedora Webserver Test Page

+ + +

Fedora Webserver Test Page

-
-
-

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

+
+ +
+

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:

-

Accordingly, please keep these facts in mind:

+

The website you just visited is either experiencing + problems or undergoing routine maintenance.

+ +

To let the administrators of this website know that you are + seeing this page and not what you were expecting, an e-mail + addressed to "webmaster" at the website's domain should reach + an appropriate person. For example, if you saw this page while visiting + www.example.com, you could 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. + This "test page" is shown instead of the expected + website if they do not set up their web server correctly.

+

Accordingly, please keep these facts in mind:

  • Neither the Fedora Project or Red Hat has any @@ -129,43 +263,56 @@ server (unless otherwise explicitly stated).
  • Neither the Fedora Project or Red Hat has "hacked" - this webserver, this test page is an included component + this webserver: this test page is an included component of the Fedora webserver software.
-

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

-
+ Fedora Project + website. +

+
- -
-

If you are the website administrator:

+
+
+ +

If you are the website administrator:

You may now add content to the webroot directory. Note that until you do so, people visiting your website will see this page, and not your content.

-

For systems using - Apache Webserver: +

For systems using + Apache Webserver: 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.

-

For systems using - Nginx: +

For systems using + Nginx: 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.

+ +

For systems using Caddy: + You should now put your content in a location of your choice and + edit the root configuration directive in the Caddy configuration + file /etc/caddy/Caddyfile. + +

+ [ Powered by Fedora ] + +
- -
- [ Powered by Fedora ] -
-
-
- + + + + From 718915cc407a3e6b20779eb423095856b4a3483d Mon Sep 17 00:00:00 2001 From: Máirín Duffy Date: Mar 11 2021 19:42:05 +0000 Subject: [PATCH 2/2] Adding classic poweredby Fedora logo Adding old poweredby Fedora logo with new classic filename. Signed-off-by: Máirín Duffy --- diff --git a/pixmaps/poweredby_classic.png b/pixmaps/poweredby_classic.png new file mode 100644 index 0000000..57de69c Binary files /dev/null and b/pixmaps/poweredby_classic.png differ