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

Proposed by Bryce Harrington
Status: Merged
Merge reported by: Bryce Harrington
Merged at revision: 3322a0b47b2529296e0411490c36cba16fb289a4
Proposed branch: ~bryce/ubuntu/+source/apache2:fix-lp1966004-jammy
Merge into: ubuntu/+source/apache2:ubuntu/devel
Diff against target: 207 lines (+49/-48)
2 files modified
debian/changelog (+13/-0)
debian/index.html (+36/-48)
Reviewer Review Type Date Requested Status
Andreas Hasenack (community) Approve
Christian Ehrhardt  (community) Approve
Lena Voytek Pending
Canonical Server Pending
Review via email: mp+417604@code.launchpad.net

Description of the change

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.)

To post a comment you must log in.
Revision history for this message
Christian Ehrhardt  (paelzer) wrote :

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
Revision history for this message
Christian Ehrhardt  (paelzer) wrote :

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?

Revision history for this message
Andreas Hasenack (ahasenack) wrote :

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

Revision history for this message
Andreas Hasenack (ahasenack) wrote :

> 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

Revision history for this message
Andreas Hasenack (ahasenack) wrote :

Typo inline.

+1 otherwise

review: Approve
e83ba76... by Bryce Harrington

review: Fix SystemD typo

3322a0b... by Bryce Harrington

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

Revision history for this message
Bryce Harrington (bryce) wrote :

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.

Revision history for this message
Andreas Hasenack (ahasenack) wrote :

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/debian/changelog b/debian/changelog
2index 6360e80..832d28f 100644
3--- a/debian/changelog
4+++ b/debian/changelog
5@@ -1,3 +1,16 @@
6+apache2 (2.4.52-1ubuntu3) jammy; urgency=medium
7+
8+ * d/index.html:
9+ - Redesign page's heading for the new logo
10+ - Use the Ubuntu font where available
11+ - Update service management directions
12+ - Copyedit grammar
13+ - Light reformatting and whitespace cleanup
14+ * d/icons/ubuntu-logo.png: Refresh ubuntu logo
15+ (LP: #1966004)
16+
17+ -- Bryce Harrington <bryce@canonical.com> Wed, 23 Mar 2022 16:18:11 -0700
18+
19 apache2 (2.4.52-1ubuntu2) jammy; urgency=medium
20
21 * SECURITY UPDATE: OOB read in mod_lua via crafted request body
22diff --git a/debian/icons/ubuntu-logo.png b/debian/icons/ubuntu-logo.png
23index 4db2fa1..eee686c 100644
24Binary files a/debian/icons/ubuntu-logo.png and b/debian/icons/ubuntu-logo.png differ
25diff --git a/debian/index.html b/debian/index.html
26index 96ed444..9c90ef4 100644
27--- a/debian/index.html
28+++ b/debian/index.html
29@@ -1,10 +1,9 @@
30-
31 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
32 <html xmlns="http://www.w3.org/1999/xhtml">
33 <!--
34 Modified from the Debian original for Ubuntu
35- Last updated: 2016-11-16
36- See: https://launchpad.net/bugs/1288690
37+ Last updated: 2022-03-22
38+ See: https://launchpad.net/bugs/1966004
39 -->
40 <head>
41 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
42@@ -20,7 +19,7 @@
43
44 background-color: #D8DBE2;
45
46- font-family: Verdana, sans-serif;
47+ font-family: Ubuntu, Verdana, sans-serif;
48 font-size: 11pt;
49 text-align: center;
50 }
51@@ -46,7 +45,7 @@
52 }
53
54 div.page_header {
55- height: 99px;
56+ height: 180px;
57 width: 100%;
58
59 background-color: #F5F6F7;
60@@ -65,6 +64,19 @@
61 border: 0px 0px 0px;
62 }
63
64+ div.banner {
65+ padding: 9px 6px 9px 6px;
66+ background-color: #E9510E;
67+ color: #FFFFFF;
68+ font-weight: bold;
69+ font-size: 112%;
70+ text-align: center;
71+ position: absolute;
72+ left: 40%;
73+ bottom: 30px;
74+ width: 20%;
75+ }
76+
77 div.table_of_contents {
78 clear: left;
79
80@@ -141,10 +153,6 @@
81 text-align: center;
82 }
83
84- div.section_header_red {
85- background-color: #CD214F;
86- }
87-
88 div.section_header_grey {
89 background-color: #9F9386;
90 }
91@@ -193,36 +201,20 @@
92 <body>
93 <div class="main_page">
94 <div class="page_header floating_element">
95- <img src="/icons/ubuntu-logo.png" alt="Ubuntu Logo" class="floating_element"/>
96- <span class="floating_element">
97- Apache2 Ubuntu Default Page
98- </span>
99- </div>
100-<!-- <div class="table_of_contents floating_element">
101- <div class="section_header section_header_grey">
102- TABLE OF CONTENTS
103- </div>
104- <div class="table_of_contents_item floating_element">
105- <a href="#about">About</a>
106- </div>
107- <div class="table_of_contents_item floating_element">
108- <a href="#changes">Changes</a>
109- </div>
110- <div class="table_of_contents_item floating_element">
111- <a href="#scope">Scope</a>
112- </div>
113- <div class="table_of_contents_item floating_element">
114- <a href="#files">Config files</a>
115+ <img src="icons/ubuntu-logo.png" alt="Ubuntu Logo"
116+ style="width:184px;height:146px;" class="floating_element" />
117+ <div>
118+ <span style="margin-top: 1.5em;" class="floating_element">
119+ Apache2 Default Page
120+ </span>
121 </div>
122- </div>
123--->
124- <div class="content_section floating_element">
125-
126-
127- <div class="section_header section_header_red">
128+ <div class="banner">
129 <div id="about"></div>
130 It works!
131 </div>
132+
133+ </div>
134+ <div class="content_section floating_element">
135 <div class="content_section_text">
136 <p>
137 This is the default welcome page used to test the correct
138@@ -234,7 +226,6 @@
139 <tt>/var/www/html/index.html</tt>) before continuing to operate your HTTP server.
140 </p>
141
142-
143 <p>
144 If you are a normal user of this web site and don't know what this page is
145 about, this probably means that the site is currently unavailable due to
146@@ -257,7 +248,6 @@
147 documentation. Documentation for the web server itself can be
148 found by accessing the <a href="/manual">manual</a> if the <tt>apache2-doc</tt>
149 package was installed on this server.
150-
151 </p>
152 <p>
153 The configuration layout for an Apache2 web server installation on Ubuntu systems is as follows:
154@@ -315,9 +305,12 @@
155 </li>
156
157 <li>
158- The binary is called apache2. Due to the use of
159- environment variables, in the default configuration, apache2 needs to be
160- started/stopped with <tt>/etc/init.d/apache2</tt> or <tt>apache2ctl</tt>.
161+ The binary is called apache2 and is managed using systemd, so to
162+ start/stop the service use <tt>systemctl start apache2</tt> and
163+ <tt>systemctl stop apache2</tt>, and use <tt>systemctl status apache2</tt>
164+ and <tt>journalctl -u apache2</tt> to check status. <tt>system</tt>
165+ and <tt>apache2ctl</tt> can also be used for service management if
166+ desired.
167 <b>Calling <tt>/usr/bin/apache2</tt> directly will not work</b> with the
168 default configuration.
169 </li>
170@@ -332,7 +325,7 @@
171 <div class="content_section_text">
172 <p>
173 By default, Ubuntu does not allow access through the web browser to
174- <em>any</em> file apart of those located in <tt>/var/www</tt>,
175+ <em>any</em> file outside of those located in <tt>/var/www</tt>,
176 <a href="http://httpd.apache.org/docs/2.4/mod/mod_userdir.html" rel="nofollow">public_html</a>
177 directories (when enabled) and <tt>/usr/share</tt> (for web
178 applications). If your site is using a web document root
179@@ -341,8 +334,7 @@
180 </p>
181 <p>
182 The default Ubuntu document root is <tt>/var/www/html</tt>. You
183- can make your own virtual hosts under /var/www. This is different
184- to previous releases which provides better security out of the box.
185+ can make your own virtual hosts under /var/www.
186 </p>
187 </div>
188
189@@ -359,17 +351,13 @@
190 </p>
191 <p>
192 Please report bugs specific to modules (such as PHP and others)
193- to respective packages, not to the web server itself.
194+ to their respective packages, not to the web server itself.
195 </p>
196 </div>
197
198-
199-
200-
201 </div>
202 </div>
203 <div class="validator">
204 </div>
205 </body>
206 </html>
207-

Subscribers

People subscribed via source and target branches