Ubuntu Mirror Charm

Merge ~pjdc/ubuntu-mirror-charm/+git/ubuntu-mirror-charm:log-canonical-port into ubuntu-mirror-charm:master

  1. Git
  2. lp:~pjdc/ubuntu-mirror-charm/+git/ubuntu-mirror-charm
  3. log-canonical-port
  4. Merge into master
Proposed by Paul Collins
Status: Merged
Approved by: Haw Loeung
Approved revision: 735e1889864deca64e276e538169b2fa62b5fa7f
Merged at revision: 8b027b9688e1d16f6fc401505b981398560f6388
Proposed branch: ~pjdc/ubuntu-mirror-charm/+git/ubuntu-mirror-charm:log-canonical-port
Merge into: ubuntu-mirror-charm:master
Diff against target: 93 lines (+12/-9)
6 files modified
templates/apache-cdimage.tmpl (+2/-1)
templates/apache-cloud-images.tmpl (+2/-2)
templates/apache-ports.tmpl (+2/-1)
templates/apache-releases.tmpl (+2/-2)
templates/apache-simple-streams.tmpl (+2/-2)
templates/apache-ubuntu.tmpl (+2/-1)
Reviewer Review Type Date Requested Status
Haw Loeung +1 Approve
Canonical IS Reviewers Pending
Review via email: mp+381789@code.launchpad.net

Commit message

use new combined-port LogFormat, replacing %l with %p (the canonical port)

To post a comment you must log in.
Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

Revision history for this message
Haw Loeung (hloeung) wrote :

LGTM

review: Approve (+1)
Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

Change successfully merged at revision 8b027b9688e1d16f6fc401505b981398560f6388

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/templates/apache-cdimage.tmpl b/templates/apache-cdimage.tmpl
2index dd8b9a4..aaf8502 100644
3--- a/templates/apache-cdimage.tmpl
4+++ b/templates/apache-cdimage.tmpl
5@@ -7,8 +7,9 @@ ${apache_early_extra}
6 ServerAlias ${alias}
7 #end for
8
9- CustomLog ${logdir}/${name}-access.log combined
10+ CustomLog ${logdir}/${name}-access.log combined-port
11 ErrorLog ${logdir}/${name}-error.log
12+ LogFormat "%h %p %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" combined-port
13
14 #if $port == 443
15 SSLEngine On
16diff --git a/templates/apache-cloud-images.tmpl b/templates/apache-cloud-images.tmpl
17index 541b1e4..70118bd 100644
18--- a/templates/apache-cloud-images.tmpl
19+++ b/templates/apache-cloud-images.tmpl
20@@ -7,9 +7,9 @@ ${apache_early_extra}
21 ServerAlias ${alias}
22 #end for
23
24- CustomLog ${logdir}/${name}-access.log combined-ext
25+ CustomLog ${logdir}/${name}-access.log combined-port
26 ErrorLog ${logdir}/${name}-error.log
27- LogFormat "%h %D %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" combined-ext
28+ LogFormat "%h %p %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" combined-port
29
30 #if $port == 443
31 SSLEngine On
32diff --git a/templates/apache-ports.tmpl b/templates/apache-ports.tmpl
33index 654e7da..682ad9e 100644
34--- a/templates/apache-ports.tmpl
35+++ b/templates/apache-ports.tmpl
36@@ -7,8 +7,9 @@ ${apache_early_extra}
37 ServerAlias ${alias}
38 #end for
39
40- CustomLog ${logdir}/${name}-access.log combined
41+ CustomLog ${logdir}/${name}-access.log combined-port
42 ErrorLog ${logdir}/${name}-error.log
43+ LogFormat "%h %p %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" combined-port
44
45 #if $port == 443
46 SSLEngine On
47diff --git a/templates/apache-releases.tmpl b/templates/apache-releases.tmpl
48index b0c0a92..93edd16 100644
49--- a/templates/apache-releases.tmpl
50+++ b/templates/apache-releases.tmpl
51@@ -7,9 +7,9 @@ ${apache_early_extra}
52 ServerAlias ${alias}
53 #end for
54
55- CustomLog ${logdir}/${name}-access.log combined-ext
56+ CustomLog ${logdir}/${name}-access.log combined-port
57 ErrorLog ${logdir}/${name}-error.log
58- LogFormat "%h %D %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" combined-ext
59+ LogFormat "%h %p %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" combined-port
60
61 #if $port == 443
62 SSLEngine On
63diff --git a/templates/apache-simple-streams.tmpl b/templates/apache-simple-streams.tmpl
64index 88d98a7..3f04092 100644
65--- a/templates/apache-simple-streams.tmpl
66+++ b/templates/apache-simple-streams.tmpl
67@@ -7,9 +7,9 @@ ${apache_early_extra}
68 ServerAlias ${alias}
69 #end for
70
71- CustomLog ${logdir}/${name}-access.log combined-ext
72+ CustomLog ${logdir}/${name}-access.log combined-port
73 ErrorLog ${logdir}/${name}-error.log
74- LogFormat "%h %D %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" combined-ext
75+ LogFormat "%h %p %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" combined-port
76
77 #if $port == 443
78 SSLEngine On
79diff --git a/templates/apache-ubuntu.tmpl b/templates/apache-ubuntu.tmpl
80index 7dde1b8..2c2df87 100644
81--- a/templates/apache-ubuntu.tmpl
82+++ b/templates/apache-ubuntu.tmpl
83@@ -7,8 +7,9 @@ ${apache_early_extra}
84 ServerAlias ${alias}
85 #end for
86
87- CustomLog ${logdir}/${name}-access.log combined
88+ CustomLog ${logdir}/${name}-access.log combined-port
89 ErrorLog ${logdir}/${name}-error.log
90+ LogFormat "%h %p %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" combined-port
91
92 #if $port == 443
93 SSLEngine On

Subscribers

People subscribed via source and target branches