Ubuntu Mirror Charm

Merge ~pjdc/ubuntu-mirror-charm/+git/ubuntu-mirror-charm:linuxcontainers-logdir into ubuntu-mirror-charm:master

  1. Git
  2. lp:~pjdc/ubuntu-mirror-charm/+git/ubuntu-mirror-charm
  3. linuxcontainers-logdir
  4. Merge into master
Proposed by Paul Collins
Status: Merged
Approved by: Haw Loeung
Approved revision: 96cefa07f6898623a703cd0327ec3c9562949be1
Merged at revision: b4b3363159b7e5f642a44c9d4123c9f25b2ed5aa
Proposed branch: ~pjdc/ubuntu-mirror-charm/+git/ubuntu-mirror-charm:linuxcontainers-logdir
Merge into: ubuntu-mirror-charm:master
Diff against target: 148 lines (+15/-13)
4 files modified
templates/apache-linuxcontainers.tmpl (+2/-2)
tests/unit/test_templates.py (+2/-0)
tests/unit/testdata/linuxcontainers/linuxcontainers.txt (+9/-9)
tests/unit/testdata/linuxcontainers/thirdparty.txt (+2/-2)
Reviewer Review Type Date Requested Status
Haw Loeung +1 Approve
Canonical IS Reviewers Pending
Review via email: mp+411391@code.launchpad.net

Commit message

honour apache_logdir config setting for linuxcontainers

To post a comment you must log in.
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 :

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

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

Change successfully merged at revision b4b3363159b7e5f642a44c9d4123c9f25b2ed5aa

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/templates/apache-linuxcontainers.tmpl b/templates/apache-linuxcontainers.tmpl
2index 75b9501..7af3f8d 100644
3--- a/templates/apache-linuxcontainers.tmpl
4+++ b/templates/apache-linuxcontainers.tmpl
5@@ -15,7 +15,7 @@
6 ServerAlias ${alias}
7 #end for
8 #end if
9- CustomLog \${APACHE_LOG_DIR}/${name}.log vhost_combined
10+ CustomLog ${logdir}/${name}.log vhost_combined
11 DocumentRoot /srv/${name}/www
12
13 <Location />
14@@ -37,7 +37,7 @@
15 #for $alias in $aliases
16 <VirtualHost ${sockets}>
17 ServerName ${alias}
18- CustomLog \${APACHE_LOG_DIR}/${alias}.log vhost_combined
19+ CustomLog ${logdir}/${alias}.log vhost_combined
20 DocumentRoot /srv/${name}/www
21
22 <Location />
23diff --git a/tests/unit/test_templates.py b/tests/unit/test_templates.py
24index cf21256..ea2366b 100644
25--- a/tests/unit/test_templates.py
26+++ b/tests/unit/test_templates.py
27@@ -68,6 +68,7 @@ LINUXCONTAINERS_THIRDPARTY_SEARCH_LIST = {
28 'name': 'lxd.example.net',
29 'aliases': ['uk.lxd.example.net', 'us.lxd.example.net'],
30 'ports': [80, 443],
31+ 'logdir': '/var/log/apache2',
32 }
33
34 LINUXCONTAINERS_SEARCH_LIST = {
35@@ -75,6 +76,7 @@ LINUXCONTAINERS_SEARCH_LIST = {
36 'name': 'lxd.images.canonical.com',
37 'aliases': ['uk.lxd.images.canonical.com', 'us.lxd.images.canonical.com'],
38 'ports': [80, 443, 8443],
39+ 'logdir': '/var/log/apache2',
40 }
41
42
43diff --git a/tests/unit/testdata/linuxcontainers/linuxcontainers.txt b/tests/unit/testdata/linuxcontainers/linuxcontainers.txt
44index bdbb8f4..cf1feed 100644
45--- a/tests/unit/testdata/linuxcontainers/linuxcontainers.txt
46+++ b/tests/unit/testdata/linuxcontainers/linuxcontainers.txt
47@@ -1,6 +1,6 @@
48 <VirtualHost 91.189.88.247:80 [2001:67c:1360:8001::33]:80>
49 ServerName lxd.images.canonical.com
50- CustomLog ${APACHE_LOG_DIR}/lxd.images.canonical.com.log vhost_combined
51+ CustomLog /var/log/apache2/lxd.images.canonical.com.log vhost_combined
52 DocumentRoot /srv/lxd.images.canonical.com/www
53
54 <Location />
55@@ -57,7 +57,7 @@
56
57 <VirtualHost 91.189.88.247:80 [2001:67c:1360:8001::33]:80>
58 ServerName uk.lxd.images.canonical.com
59- CustomLog ${APACHE_LOG_DIR}/uk.lxd.images.canonical.com.log vhost_combined
60+ CustomLog /var/log/apache2/uk.lxd.images.canonical.com.log vhost_combined
61 DocumentRoot /srv/lxd.images.canonical.com/www
62
63 <Location />
64@@ -114,7 +114,7 @@
65
66 <VirtualHost 91.189.88.247:80 [2001:67c:1360:8001::33]:80>
67 ServerName us.lxd.images.canonical.com
68- CustomLog ${APACHE_LOG_DIR}/us.lxd.images.canonical.com.log vhost_combined
69+ CustomLog /var/log/apache2/us.lxd.images.canonical.com.log vhost_combined
70 DocumentRoot /srv/lxd.images.canonical.com/www
71
72 <Location />
73@@ -171,7 +171,7 @@
74
75 <VirtualHost 91.189.88.247:443 [2001:67c:1360:8001::33]:443>
76 ServerName lxd.images.canonical.com
77- CustomLog ${APACHE_LOG_DIR}/lxd.images.canonical.com.log vhost_combined
78+ CustomLog /var/log/apache2/lxd.images.canonical.com.log vhost_combined
79 DocumentRoot /srv/lxd.images.canonical.com/www
80
81 <Location />
82@@ -237,7 +237,7 @@
83
84 <VirtualHost 91.189.88.247:443 [2001:67c:1360:8001::33]:443>
85 ServerName uk.lxd.images.canonical.com
86- CustomLog ${APACHE_LOG_DIR}/uk.lxd.images.canonical.com.log vhost_combined
87+ CustomLog /var/log/apache2/uk.lxd.images.canonical.com.log vhost_combined
88 DocumentRoot /srv/lxd.images.canonical.com/www
89
90 <Location />
91@@ -303,7 +303,7 @@
92
93 <VirtualHost 91.189.88.247:443 [2001:67c:1360:8001::33]:443>
94 ServerName us.lxd.images.canonical.com
95- CustomLog ${APACHE_LOG_DIR}/us.lxd.images.canonical.com.log vhost_combined
96+ CustomLog /var/log/apache2/us.lxd.images.canonical.com.log vhost_combined
97 DocumentRoot /srv/lxd.images.canonical.com/www
98
99 <Location />
100@@ -369,7 +369,7 @@
101
102 <VirtualHost 91.189.88.247:8443 [2001:67c:1360:8001::33]:8443>
103 ServerName lxd.images.canonical.com
104- CustomLog ${APACHE_LOG_DIR}/lxd.images.canonical.com.log vhost_combined
105+ CustomLog /var/log/apache2/lxd.images.canonical.com.log vhost_combined
106 DocumentRoot /srv/lxd.images.canonical.com/www
107
108 <Location />
109@@ -435,7 +435,7 @@
110
111 <VirtualHost 91.189.88.247:8443 [2001:67c:1360:8001::33]:8443>
112 ServerName uk.lxd.images.canonical.com
113- CustomLog ${APACHE_LOG_DIR}/uk.lxd.images.canonical.com.log vhost_combined
114+ CustomLog /var/log/apache2/uk.lxd.images.canonical.com.log vhost_combined
115 DocumentRoot /srv/lxd.images.canonical.com/www
116
117 <Location />
118@@ -501,7 +501,7 @@
119
120 <VirtualHost 91.189.88.247:8443 [2001:67c:1360:8001::33]:8443>
121 ServerName us.lxd.images.canonical.com
122- CustomLog ${APACHE_LOG_DIR}/us.lxd.images.canonical.com.log vhost_combined
123+ CustomLog /var/log/apache2/us.lxd.images.canonical.com.log vhost_combined
124 DocumentRoot /srv/lxd.images.canonical.com/www
125
126 <Location />
127diff --git a/tests/unit/testdata/linuxcontainers/thirdparty.txt b/tests/unit/testdata/linuxcontainers/thirdparty.txt
128index 7150e4a..2324806 100644
129--- a/tests/unit/testdata/linuxcontainers/thirdparty.txt
130+++ b/tests/unit/testdata/linuxcontainers/thirdparty.txt
131@@ -2,7 +2,7 @@
132 ServerName lxd.example.net
133 ServerAlias uk.lxd.example.net
134 ServerAlias us.lxd.example.net
135- CustomLog ${APACHE_LOG_DIR}/lxd.example.net.log vhost_combined
136+ CustomLog /var/log/apache2/lxd.example.net.log vhost_combined
137 DocumentRoot /srv/lxd.example.net/www
138
139 <Location />
140@@ -61,7 +61,7 @@
141 ServerName lxd.example.net
142 ServerAlias uk.lxd.example.net
143 ServerAlias us.lxd.example.net
144- CustomLog ${APACHE_LOG_DIR}/lxd.example.net.log vhost_combined
145+ CustomLog /var/log/apache2/lxd.example.net.log vhost_combined
146 DocumentRoot /srv/lxd.example.net/www
147
148 <Location />

Subscribers

People subscribed via source and target branches