Merge ~bryce/ubuntu/+source/apache2:fix-lp1966004-jammy into ubuntu/+source/apache2:ubuntu/devel

[Bryce Harrington]

Updates the branding for the default index.html created from a new Apache2 installation. This page can also show up when the server is misconfigured.

The PNG file provided to us by the branding effort is of differing dimensions and visual layout than the previous logo. I tried resizing it to match the old one (reduced to 1/8th size). Here's a before/after comparison: http://www.bryceharrington.org/experimental/new_apache.png

As you can see, I also replaced the Debian-branded coloring of the 'It works!' heading with Ubuntu orange, and added some margin under the logo image to better balance things. Unfortunately, scaling by 1/8th is a bit too much, as the 'Ubuntu' text in the PNG thins out too much.

I ended up going with a 1/4th scaling of the logo, and did a bit of CSS redesign on the header:

    http://www.bryceharrington.org/experimental/new_apache_mark_2.png

You'll note there that I also changed the default font for the page to 'Ubuntu' (which makes the text more consistent with the logo), and simplified the title to 'Apache2 Default Page', dropping the redundant 'Ubuntu'.

While I was at it, I did a bit of light copyediting and reformatting on the body text to fix some bad grammar, remove a commented-out TOC, and cleanup whitespace in the HTML code.

Of a more technical note, the directions for starting/stopping apache were out of date, so I replaced them with more current directions with systemd. (This change isn't visible in the above screenshot; reviewers should look at the index.html diff in this MP.)

[Christian Ehrhardt  (paelzer)]

I just saw that this isn't even an upstream page that Debian modified, instead it is "just" a file in debian/ . That is great as I expect less churn on that and furthermore zero churn when we e.g. backport changes for SRUs or such.
I'm happy with the maintenance effort that should come out of this as Debian rarely updates this.

The new visuals LGTM, lets us see what others say.

The typos, whitespace and comment removal could be submitted to Debian once we agree on our way for Jammy.

+1 from my POV

review: Approve

[Christian Ehrhardt  (paelzer)]

One content comment though, do we really need to drop " or <tt>apache2ctl</tt>".
It is systemd compatible (thanks to your very own work) and has some advanced features.
@bryce - Could we keep that snippet?

[Andreas Hasenack (ahasenack)]

I'll take a look too, right after lunch, sorry for missing the request.

[Andreas Hasenack (ahasenack)]

> One content comment though, do we really need to drop " or
> <tt>apache2ctl</tt>".
> It is systemd compatible (thanks to your very own work) and has some advanced
> features.
> @bryce - Could we keep that snippet?

FWIW, the server guide[1] is using systemctl in all places. Personally, I would prefer systemctl, then service, and lastly apache2ctl.

1. https://ubuntu.com/server/docs/web-servers-apache

[Andreas Hasenack (ahasenack)]

Typo inline.

+1 otherwise

review: Approve

e83ba76... by Bryce Harrington on 2022-03-24

review: Fix SystemD typo

3322a0b... by Bryce Harrington on 2022-03-24

review: Use systemctl preferentially, to match official docs.
Mention system and apache2ctl as secondary alternatives.

[Bryce Harrington (bryce)]

Thanks, I've pushed up a branch including the review changes. Hopefully the way I've added mentions of the different service management options matches what you two have in mind.

-rw-r--r-- 1 bryce bryce 1822 Mar 25 00:20 ../apache2_2.4.52-1ubuntu3_source.changes
../apache2_2.4.52-1ubuntu3_source.changes
Vcs-Git: https://git.launchpad.net/~bryce/ubuntu/+source/apache2
Vcs-Git-Commit: 33f18d3c3fe6c3593592a4c557dea9b921365e30
Vcs-Git-Ref: refs/heads/fix-lp1966004-jammy-release

$ dput ubuntu ../apache2_2.4.52-1ubuntu3_source.changes
D: Setting host argument.
Checking signature on .changes
gpg: ../apache2_2.4.52-1ubuntu3_source.changes: Valid signature from E603B2578FB8F0FB
Checking signature on .dsc
gpg: ../apache2_2.4.52-1ubuntu3.dsc: Valid signature from E603B2578FB8F0FB
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading apache2_2.4.52-1ubuntu3.dsc: done.
  Uploading apache2_2.4.52-1ubuntu3.debian.tar.xz: done.
  Uploading apache2_2.4.52-1ubuntu3_source.buildinfo: done.
  Uploading apache2_2.4.52-1ubuntu3_source.changes: done.
Successfully uploaded packages.

[Andreas Hasenack (ahasenack)]

The package migrated already, please close this MP when you get a chance.

diff --git a/debian/changelog b/debian/changelog
index 6360e80..832d28f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+apache2 (2.4.52-1ubuntu3) jammy; urgency=medium
+
+  * d/index.html:
+    - Redesign page's heading for the new logo
+    - Use the Ubuntu font where available
+    - Update service management directions
+    - Copyedit grammar
+    - Light reformatting and whitespace cleanup
+  * d/icons/ubuntu-logo.png: Refresh ubuntu logo
+    (LP: #1966004)
+
+ -- Bryce Harrington <[e-mail]>  Wed, 23 Mar 2022 16:18:11 -0700
+
 apache2 (2.4.52-1ubuntu2) jammy; urgency=medium
 
   * SECURITY UPDATE: OOB read in mod_lua via crafted request body
diff --git a/debian/icons/ubuntu-logo.png b/debian/icons/ubuntu-logo.png
index 4db2fa1..eee686c 100644
 Binary files a/debian/icons/ubuntu-logo.png and b/debian/icons/ubuntu-logo.png differ
diff --git a/debian/index.html b/debian/index.html
index 96ed444..9c90ef4 100644
--- a/debian/index.html
+++ b/debian/index.html
@@ -1,10 +1,9 @@
-
 <!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">
   <!--
     Modified from the Debian original for Ubuntu
-    Last updated: 2016-11-16
-    See: https://launchpad.net/bugs/1288690
+    Last updated: 2022-03-22
+    See: https://launchpad.net/bugs/1966004
   -->
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
@@ -20,7 +19,7 @@
 
     background-color: #D8DBE2;
 
-    font-family: Verdana, sans-serif;
+    font-family: Ubuntu, Verdana, sans-serif;
     font-size: 11pt;
     text-align: center;
   }
@@ -46,7 +45,7 @@
   }
 
   div.page_header {
-    height: 99px;
+    height: 180px;
     width: 100%;
 
     background-color: #F5F6F7;
@@ -65,6 +64,19 @@
     border: 0px 0px 0px;
   }
 
+  div.banner {
+    padding: 9px 6px 9px 6px;
+    background-color: #E9510E;
+    color: #FFFFFF;
+    font-weight: bold;
+    font-size: 112%;
+    text-align: center;
+    position: absolute;
+    left: 40%;
+    bottom: 30px;
+    width: 20%;
+  }
+
   div.table_of_contents {
     clear: left;
 
@@ -141,10 +153,6 @@
     text-align: center;
   }
 
-  div.section_header_red {
-    background-color: #CD214F;
-  }
-
   div.section_header_grey {
     background-color: #9F9386;
   }
@@ -193,36 +201,20 @@
   <body>
     <div class="main_page">
       <div class="page_header floating_element">
-        <img src="/icons/ubuntu-logo.png" alt="Ubuntu Logo" class="floating_element"/>
-        <span class="floating_element">
-          Apache2 Ubuntu 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>
+        <img src="icons/ubuntu-logo.png" alt="Ubuntu Logo"
+             style="width:184px;height:146px;" class="floating_element" />
+        <div>
+          <span style="margin-top: 1.5em;" class="floating_element">
+            Apache2 Default Page
+          </span>
         </div>
-      </div>
--->
-      <div class="content_section floating_element">
-
-
-        <div class="section_header section_header_red">
+        <div class="banner">
           <div id="about"></div>
           It works!
         </div>
+
+      </div>
+      <div class="content_section floating_element">
         <div class="content_section_text">
           <p>
                 This is the default welcome page used to test the correct 
@@ -234,7 +226,6 @@
                 <tt>/var/www/html/index.html</tt>) before continuing to operate your HTTP server.
           </p>
 
-
           <p>
                 If you are a normal user of this web site and don't know what this page is
                 about, this probably means that the site is currently unavailable due to
@@ -257,7 +248,6 @@
                 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 Ubuntu systems is as follows:
@@ -315,9 +305,12 @@
                         </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>.
+                           The binary is called apache2 and is managed using systemd, so to
+                           start/stop the service use <tt>systemctl start apache2</tt> and
+                           <tt>systemctl stop apache2</tt>, and use <tt>systemctl status apache2</tt>
+                           and <tt>journalctl -u apache2</tt> to check status.  <tt>system</tt>
+                           and <tt>apache2ctl</tt> can also be used for service management if
+                           desired.
                            <b>Calling <tt>/usr/bin/apache2</tt> directly will not work</b> with the
                            default configuration.
                         </li>
@@ -332,7 +325,7 @@
         <div class="content_section_text">
             <p>
                 By default, Ubuntu does not allow access through the web browser to
-                <em>any</em> file apart of those located in <tt>/var/www</tt>,
+                <em>any</em> file outside of those located in <tt>/var/www</tt>,
                 <a href="http://httpd.apache.org/docs/2.4/mod/mod_userdir.html" rel="nofollow">public_html</a>
                 directories (when enabled) and <tt>/usr/share</tt> (for web
                 applications). If your site is using a web document root
@@ -341,8 +334,7 @@
             </p>
             <p>
                 The default Ubuntu document root is <tt>/var/www/html</tt>. You
-                can make your own virtual hosts under /var/www. This is different
-                to previous releases which provides better security out of the box.
+                can make your own virtual hosts under /var/www.
             </p>
         </div>
 
@@ -359,17 +351,13 @@
           </p>
           <p>
                 Please report bugs specific to modules (such as PHP and others)
-                to respective packages, not to the web server itself.
+                to their respective packages, not to the web server itself.
           </p>
         </div>
 
-
-
-
       </div>
     </div>
     <div class="validator">
     </div>
   </body>
 </html>
-