[apache2] 01/01: Rework the default index.html file. Instead of a blank, minimalistic page give a quick start guide, since nobody seems to read our docs.
Arno Töll
atoell-guest at alioth.debian.org
Sat Nov 2 17:19:45 UTC 2013
This is an automated email from the git hooks/post-receive script.
atoell-guest pushed a commit to branch master
in repository apache2.
commit de31e3816abb40ce87585c8b946bce0260cbe831
Author: Arno Töll <arno at debian.org>
Date: Sat Nov 2 18:19:32 2013 +0100
Rework the default index.html file. Instead of a blank, minimalistic page give a quick start guide, since nobody seems to read our docs.
---
debian/changelog | 5 +-
debian/icons/openlogo-75.png | Bin 0 -> 5754 bytes
debian/index.html | 366 +++++++++++++++++++++++++++++++++++++++-
debian/source/include-binaries | 1 +
4 files changed, 367 insertions(+), 5 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index d686609..1f1dfa1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,8 +19,11 @@ apache2 (2.4.6-4) UNRELEASED; urgency=low
authn_core. Thanks Jean-Michel Vourgère for providing a patch (Closes:
#710412)
* Allow "apache2_invoke disconf" in postinst/preinst (Closes: #717693)
+ * Rework the default index.html file. Instead of a blank, minimalistic page
+ give a quick start guide, since nobody seems to read our docs. This site
+ is hopefully explaining the most important questions.
- -- Arno Töll <arno at debian.org> Sat, 02 Nov 2013 16:18:18 +0100
+ -- Arno Töll <arno at debian.org> Sat, 02 Nov 2013 17:56:19 +0100
apache2 (2.4.6-3) unstable; urgency=low
diff --git a/debian/icons/openlogo-75.png b/debian/icons/openlogo-75.png
new file mode 100644
index 0000000..be5e1e5
Binary files /dev/null and b/debian/icons/openlogo-75.png differ
diff --git a/debian/index.html b/debian/index.html
index 1c70d95..5cad971 100644
--- a/debian/index.html
+++ b/debian/index.html
@@ -1,4 +1,362 @@
-<html><body><h1>It works!</h1>
-<p>This is the default web page for this server.</p>
-<p>The web server software is running but no content has been added, yet.</p>
-</body></html>
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+ <title>Apache2 Debian Default Page: It works</title>
+ <style type="text/css" media="screen">
+ * {
+ margin: 0px 0px 0px 0px;
+ padding: 0px 0px 0px 0px;
+ }
+
+ body, html {
+ padding: 3px 3px 3px 3px;
+
+ background-color: #D8DBE2;
+
+ font-family: Verdana, sans-serif;
+ font-size: 11pt;
+ text-align: center;
+ }
+
+ div.main_page {
+ position: relative;
+ display: table;
+
+ width: 800px;
+
+ margin-bottom: 3px;
+ margin-left: auto;
+ margin-right: auto;
+ padding: 0px 0px 0px 0px;
+
+ border-width: 2px;
+ border-color: #212738;
+ border-style: solid;
+
+ background-color: #FFFFFF;
+
+ text-align: center;
+ }
+
+ div.page_header {
+ height: 99px;
+ width: 100%;
+
+ background-color: #F5F6F7;
+ }
+
+ div.page_header span {
+ margin: 15px 0px 0px 50px;
+
+ font-size: 180%;
+ font-weight: bold;
+ }
+
+ div.page_header img {
+ margin: 3px 0px 0px 40px;
+
+ border: 0px 0px 0px;
+ }
+
+ div.table_of_contents {
+ clear: left;
+
+ min-width: 200px;
+
+ margin: 3px 3px 3px 3px;
+
+ background-color: #FFFFFF;
+
+ text-align: left;
+ }
+
+ div.table_of_contents_item {
+ clear: left;
+
+ width: 100%;
+
+ margin: 4px 0px 0px 0px;
+
+ background-color: #FFFFFF;
+
+ color: #000000;
+ text-align: left;
+ }
+
+ div.table_of_contents_item a {
+ margin: 6px 0px 0px 6px;
+ }
+
+ div.content_section {
+ margin: 3px 3px 3px 3px;
+
+ background-color: #FFFFFF;
+
+ text-align: left;
+ }
+
+ div.content_section_text {
+ padding: 4px 8px 4px 8px;
+
+ color: #000000;
+ font-size: 100%;
+ }
+
+ div.content_section_text pre {
+ margin: 8px 0px 8px 0px;
+ padding: 8px 8px 8px 8px;
+
+ border-width: 1px;
+ border-style: dotted;
+ border-color: #000000;
+
+ background-color: #F5F6F7;
+
+ font-style: italic;
+ }
+
+ div.content_section_text p {
+ margin-bottom: 6px;
+ }
+
+ div.content_section_text ul, div.content_section_text li {
+ padding: 4px 8px 4px 16px;
+ }
+
+ div.section_header {
+ padding: 3px 6px 3px 6px;
+
+ background-color: #8E9CB2;
+
+ color: #FFFFFF;
+ font-weight: bold;
+ font-size: 112%;
+ text-align: center;
+ }
+
+ div.section_header_red {
+ background-color: #CD214F;
+ }
+
+ div.section_header_grey {
+ background-color: #9F9386;
+ }
+
+ .floating_element {
+ position: relative;
+ float: left;
+ }
+
+ div.table_of_contents_item a,
+ div.content_section_text a {
+ text-decoration: none;
+ font-weight: bold;
+ }
+
+ div.table_of_contents_item a:link,
+ div.table_of_contents_item a:visited,
+ div.table_of_contents_item a:active {
+ color: #000000;
+ }
+
+ div.table_of_contents_item a:hover {
+ background-color: #000000;
+
+ color: #FFFFFF;
+ }
+
+ div.content_section_text a:link,
+ div.content_section_text a:visited,
+ div.content_section_text a:active {
+ background-color: #DCDFE6;
+
+ color: #000000;
+ }
+
+ div.content_section_text a:hover {
+ background-color: #000000;
+
+ color: #DCDFE6;
+ }
+
+ div.validator {
+ }
+ </style>
+ </head>
+ <body>
+ <div class="main_page">
+ <div class="page_header floating_element">
+ <img src="/icons/openlogo-75.png" alt="Debian Logo" class="floating_element"/>
+ <span class="floating_element">
+ Apache2 Debian Default Page
+ </span>
+ </div>
+<!-- <div class="table_of_contents floating_element">
+ <div class="section_header section_header_grey">
+ TABLE OF CONTENTS
+ </div>
+ <div class="table_of_contents_item floating_element">
+ <a href="#about">About</a>
+ </div>
+ <div class="table_of_contents_item floating_element">
+ <a href="#changes">Changes</a>
+ </div>
+ <div class="table_of_contents_item floating_element">
+ <a href="#scope">Scope</a>
+ </div>
+ <div class="table_of_contents_item floating_element">
+ <a href="#files">Config files</a>
+ </div>
+ </div>
+-->
+ <div class="content_section floating_element">
+
+
+ <div class="section_header section_header_red">
+ <div id="about"></div>
+ It works!
+ </div>
+ <div class="content_section_text">
+ <p>
+ This is the default welcome page used to test the proper
+ operation of the Apache2 server after it has been installed on Debian systems.
+ If you can read this page, it means that the Apache HTTP server installed at
+ this site is working properly. You should <b>replace this file</b> (located at
+ <tt>/var/www/index.html</tt>) before continuing to operate your HTTP server.
+ </p>
+ </div>
+ <div class="section_header">
+ <div id="changes"></div>
+ Configuration Overview
+ </div>
+ <div class="content_section_text">
+ <p>
+ Debian's Apache2 default configuration is different to the
+ upstream default configuration, and split into several files optimized for
+ interaction with Debian tools. The configuration system is
+ <b>fully documented in
+ /usr/share/doc/apache2/README.Debian.gz</b>. Refer there for a full
+ documentation. Documentation for the web server itself can be
+ found by accessing the <a href="/manual">manual</a> if the <tt>apache2-doc</tt>
+ package was installed on this server.
+
+ </p>
+ <p>
+ The configuration layout for an Apache2 web server installation on Debian systems is as follows:
+ </p>
+ <pre>
+/etc/apache2/
+|-- apache2.conf
+| `-- ports.conf
+|-- mods-enabled
+| |-- *.load
+| `-- *.conf
+|-- conf-enabled
+| `-- *.conf
+|-- sites-enabled
+| `-- *.conf
+ </pre>
+ <ul>
+ <li>
+ <tt>apache2.conf</tt> is the main configuration
+ file. It puts the pieces together by including all remaining configuration
+ files when starting up the web server.
+ </li>
+
+ <li>
+ <tt>ports.conf</tt> is always included from the
+ main configuration file. It is supposed to determine listening ports for
+ incoming connections which can be customized anytime.
+ </li>
+
+ <li>
+ Configuration files in the <tt>mods-enabled/</tt>,
+ <tt>conf-enabled/</tt> and <tt>sites-enabled/</tt> directories contain
+ particular configuration snippets which manage modules, global configuration
+ fragments, or virtual host configurations, respectively.
+ </li>
+
+ <li>
+ They are activated by symlinking available
+ configuration files from their respective
+ *-available/ counterparts. These should be managed
+ by using our helpers
+ <tt>
+ <a href="http://manpages.debian.org/cgi-bin/man.cgi?query=a2enmod">a2enmod</a>,
+ <a href="http://manpages.debian.org/cgi-bin/man.cgi?query=a2dismod">a2dismod</a>,
+ </tt>
+ <tt>
+ <a href="http://manpages.debian.org/cgi-bin/man.cgi?query=a2ensite">a2ensite</a>,
+ <a href="http://manpages.debian.org/cgi-bin/man.cgi?query=a2dissite">a2dissite</a>,
+ </tt>
+ and
+ <tt>
+ <a href="http://manpages.debian.org/cgi-bin/man.cgi?query=a2enconf">a2enconf</a>,
+ <a href="http://manpages.debian.org/cgi-bin/man.cgi?query=a2disconf">a2disconf</a>
+ </tt>. See their respective man pages for detailed information.
+ </li>
+
+ <li>
+ The binary is called apache2. Due to the use of
+ environment variables, in the default configuration, apache2 needs to be
+ started/stopped with <tt>/etc/init.d/apache2</tt> or <tt>apache2ctl</tt>.
+ <b>Calling <tt>/usr/bin/apache2</tt> directly will not work</b> with the
+ default configuration.
+ </li>
+ </ul>
+ </div>
+
+ <div class="section_header">
+ <div id="docroot"></div>
+ Document Roots
+ </div>
+
+ <div class="content_section_text">
+ <p>
+ By default, Debian does not allow access through the web browser to
+ <em>any</em> file apart of those located in <tt>/var/www</tt>,
+ <a href="http://httpd.apache.org/docs/2.4/mod/mod_userdir.html">public_html</a>
+ directories (when enabled) and <tt>/usr/share</tt> (for web
+ applications). If your site is using a web document root
+ located elsewhere (such as in <tt>/srv</tt>) you may need to whitelist your
+ document root directory in <tt>/etc/apache2/apach2.conf</tt>.
+ </p>
+ <p>
+ XXX: Write here where to place additional doc roots/explain the
+ /var/www issue. This needs a decision on the doc root first,
+ though.
+ </p>
+ </div>
+
+ <div class="section_header">
+ <div id="bugs"></div>
+ Reporting Problems
+ </div>
+ <div class="content_section_text">
+ <p>
+ Please use the <tt>reportbug</tt> tool to report bugs in the
+ Apache2 package with Debian. However, check <a
+ href="http://bugs.debian.org/cgi-bin/pkgreport.cgi?ordering=normal;archive=0;src=apache2;repeatmerged=0">existing
+ bug reports</a> before reporting a new bug.
+ </p>
+ <p>
+ Please report bugs specific to modules (such as PHP and others)
+ to respective packages, not to the web server itself.
+ </p>
+ </div>
+
+
+
+
+ </div>
+ </div>
+ <div class="validator">
+ <p>
+ <a href="http://validator.w3.org/check?uri=referer"><img src="http://www.w3.org/Icons/valid-xhtml10" alt="Valid XHTML 1.0 Transitional" height="31" width="88" /></a>
+ </p>
+ </div>
+ </body>
+</html>
+
diff --git a/debian/source/include-binaries b/debian/source/include-binaries
index c81f7aa..cfcd7ef 100644
--- a/debian/source/include-binaries
+++ b/debian/source/include-binaries
@@ -15,3 +15,4 @@ debian/icons/odf6ods-20x22.png
debian/icons/odf6odp-20x22.png
debian/icons/odf6otp-20x22.png
debian/icons/odf6oth-20x22.png
+debian/icons/openlogo-75.png
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-apache/apache2.git
More information about the Pkg-apache-commits
mailing list