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
diff --git a/templates/apache-linuxcontainers.tmpl b/templates/apache-linuxcontainers.tmpl
index 75b9501..7af3f8d 100644
--- a/templates/apache-linuxcontainers.tmpl
+++ b/templates/apache-linuxcontainers.tmpl
@@ -15,7 +15,7 @@
15 ServerAlias ${alias}15 ServerAlias ${alias}
16 #end for16 #end for
17#end if17#end if
18 CustomLog \${APACHE_LOG_DIR}/${name}.log vhost_combined18 CustomLog ${logdir}/${name}.log vhost_combined
19 DocumentRoot /srv/${name}/www19 DocumentRoot /srv/${name}/www
2020
21 <Location />21 <Location />
@@ -37,7 +37,7 @@
37#for $alias in $aliases37#for $alias in $aliases
38<VirtualHost ${sockets}>38<VirtualHost ${sockets}>
39 ServerName ${alias}39 ServerName ${alias}
40 CustomLog \${APACHE_LOG_DIR}/${alias}.log vhost_combined40 CustomLog ${logdir}/${alias}.log vhost_combined
41 DocumentRoot /srv/${name}/www41 DocumentRoot /srv/${name}/www
4242
43 <Location />43 <Location />
diff --git a/tests/unit/test_templates.py b/tests/unit/test_templates.py
index cf21256..ea2366b 100644
--- a/tests/unit/test_templates.py
+++ b/tests/unit/test_templates.py
@@ -68,6 +68,7 @@ LINUXCONTAINERS_THIRDPARTY_SEARCH_LIST = {
68 'name': 'lxd.example.net',68 'name': 'lxd.example.net',
69 'aliases': ['uk.lxd.example.net', 'us.lxd.example.net'],69 'aliases': ['uk.lxd.example.net', 'us.lxd.example.net'],
70 'ports': [80, 443],70 'ports': [80, 443],
71 'logdir': '/var/log/apache2',
71}72}
7273
73LINUXCONTAINERS_SEARCH_LIST = {74LINUXCONTAINERS_SEARCH_LIST = {
@@ -75,6 +76,7 @@ LINUXCONTAINERS_SEARCH_LIST = {
75 'name': 'lxd.images.canonical.com',76 'name': 'lxd.images.canonical.com',
76 'aliases': ['uk.lxd.images.canonical.com', 'us.lxd.images.canonical.com'],77 'aliases': ['uk.lxd.images.canonical.com', 'us.lxd.images.canonical.com'],
77 'ports': [80, 443, 8443],78 'ports': [80, 443, 8443],
79 'logdir': '/var/log/apache2',
78}80}
7981
8082
diff --git a/tests/unit/testdata/linuxcontainers/linuxcontainers.txt b/tests/unit/testdata/linuxcontainers/linuxcontainers.txt
index bdbb8f4..cf1feed 100644
--- a/tests/unit/testdata/linuxcontainers/linuxcontainers.txt
+++ b/tests/unit/testdata/linuxcontainers/linuxcontainers.txt
@@ -1,6 +1,6 @@
1<VirtualHost 91.189.88.247:80 [2001:67c:1360:8001::33]:80>1<VirtualHost 91.189.88.247:80 [2001:67c:1360:8001::33]:80>
2 ServerName lxd.images.canonical.com2 ServerName lxd.images.canonical.com
3 CustomLog ${APACHE_LOG_DIR}/lxd.images.canonical.com.log vhost_combined3 CustomLog /var/log/apache2/lxd.images.canonical.com.log vhost_combined
4 DocumentRoot /srv/lxd.images.canonical.com/www4 DocumentRoot /srv/lxd.images.canonical.com/www
55
6 <Location />6 <Location />
@@ -57,7 +57,7 @@
5757
58<VirtualHost 91.189.88.247:80 [2001:67c:1360:8001::33]:80>58<VirtualHost 91.189.88.247:80 [2001:67c:1360:8001::33]:80>
59 ServerName uk.lxd.images.canonical.com59 ServerName uk.lxd.images.canonical.com
60 CustomLog ${APACHE_LOG_DIR}/uk.lxd.images.canonical.com.log vhost_combined60 CustomLog /var/log/apache2/uk.lxd.images.canonical.com.log vhost_combined
61 DocumentRoot /srv/lxd.images.canonical.com/www61 DocumentRoot /srv/lxd.images.canonical.com/www
6262
63 <Location />63 <Location />
@@ -114,7 +114,7 @@
114114
115<VirtualHost 91.189.88.247:80 [2001:67c:1360:8001::33]:80>115<VirtualHost 91.189.88.247:80 [2001:67c:1360:8001::33]:80>
116 ServerName us.lxd.images.canonical.com116 ServerName us.lxd.images.canonical.com
117 CustomLog ${APACHE_LOG_DIR}/us.lxd.images.canonical.com.log vhost_combined117 CustomLog /var/log/apache2/us.lxd.images.canonical.com.log vhost_combined
118 DocumentRoot /srv/lxd.images.canonical.com/www118 DocumentRoot /srv/lxd.images.canonical.com/www
119119
120 <Location />120 <Location />
@@ -171,7 +171,7 @@
171171
172<VirtualHost 91.189.88.247:443 [2001:67c:1360:8001::33]:443>172<VirtualHost 91.189.88.247:443 [2001:67c:1360:8001::33]:443>
173 ServerName lxd.images.canonical.com173 ServerName lxd.images.canonical.com
174 CustomLog ${APACHE_LOG_DIR}/lxd.images.canonical.com.log vhost_combined174 CustomLog /var/log/apache2/lxd.images.canonical.com.log vhost_combined
175 DocumentRoot /srv/lxd.images.canonical.com/www175 DocumentRoot /srv/lxd.images.canonical.com/www
176176
177 <Location />177 <Location />
@@ -237,7 +237,7 @@
237237
238<VirtualHost 91.189.88.247:443 [2001:67c:1360:8001::33]:443>238<VirtualHost 91.189.88.247:443 [2001:67c:1360:8001::33]:443>
239 ServerName uk.lxd.images.canonical.com239 ServerName uk.lxd.images.canonical.com
240 CustomLog ${APACHE_LOG_DIR}/uk.lxd.images.canonical.com.log vhost_combined240 CustomLog /var/log/apache2/uk.lxd.images.canonical.com.log vhost_combined
241 DocumentRoot /srv/lxd.images.canonical.com/www241 DocumentRoot /srv/lxd.images.canonical.com/www
242242
243 <Location />243 <Location />
@@ -303,7 +303,7 @@
303303
304<VirtualHost 91.189.88.247:443 [2001:67c:1360:8001::33]:443>304<VirtualHost 91.189.88.247:443 [2001:67c:1360:8001::33]:443>
305 ServerName us.lxd.images.canonical.com305 ServerName us.lxd.images.canonical.com
306 CustomLog ${APACHE_LOG_DIR}/us.lxd.images.canonical.com.log vhost_combined306 CustomLog /var/log/apache2/us.lxd.images.canonical.com.log vhost_combined
307 DocumentRoot /srv/lxd.images.canonical.com/www307 DocumentRoot /srv/lxd.images.canonical.com/www
308308
309 <Location />309 <Location />
@@ -369,7 +369,7 @@
369369
370<VirtualHost 91.189.88.247:8443 [2001:67c:1360:8001::33]:8443>370<VirtualHost 91.189.88.247:8443 [2001:67c:1360:8001::33]:8443>
371 ServerName lxd.images.canonical.com371 ServerName lxd.images.canonical.com
372 CustomLog ${APACHE_LOG_DIR}/lxd.images.canonical.com.log vhost_combined372 CustomLog /var/log/apache2/lxd.images.canonical.com.log vhost_combined
373 DocumentRoot /srv/lxd.images.canonical.com/www373 DocumentRoot /srv/lxd.images.canonical.com/www
374374
375 <Location />375 <Location />
@@ -435,7 +435,7 @@
435435
436<VirtualHost 91.189.88.247:8443 [2001:67c:1360:8001::33]:8443>436<VirtualHost 91.189.88.247:8443 [2001:67c:1360:8001::33]:8443>
437 ServerName uk.lxd.images.canonical.com437 ServerName uk.lxd.images.canonical.com
438 CustomLog ${APACHE_LOG_DIR}/uk.lxd.images.canonical.com.log vhost_combined438 CustomLog /var/log/apache2/uk.lxd.images.canonical.com.log vhost_combined
439 DocumentRoot /srv/lxd.images.canonical.com/www439 DocumentRoot /srv/lxd.images.canonical.com/www
440440
441 <Location />441 <Location />
@@ -501,7 +501,7 @@
501501
502<VirtualHost 91.189.88.247:8443 [2001:67c:1360:8001::33]:8443>502<VirtualHost 91.189.88.247:8443 [2001:67c:1360:8001::33]:8443>
503 ServerName us.lxd.images.canonical.com503 ServerName us.lxd.images.canonical.com
504 CustomLog ${APACHE_LOG_DIR}/us.lxd.images.canonical.com.log vhost_combined504 CustomLog /var/log/apache2/us.lxd.images.canonical.com.log vhost_combined
505 DocumentRoot /srv/lxd.images.canonical.com/www505 DocumentRoot /srv/lxd.images.canonical.com/www
506506
507 <Location />507 <Location />
diff --git a/tests/unit/testdata/linuxcontainers/thirdparty.txt b/tests/unit/testdata/linuxcontainers/thirdparty.txt
index 7150e4a..2324806 100644
--- a/tests/unit/testdata/linuxcontainers/thirdparty.txt
+++ b/tests/unit/testdata/linuxcontainers/thirdparty.txt
@@ -2,7 +2,7 @@
2 ServerName lxd.example.net2 ServerName lxd.example.net
3 ServerAlias uk.lxd.example.net3 ServerAlias uk.lxd.example.net
4 ServerAlias us.lxd.example.net4 ServerAlias us.lxd.example.net
5 CustomLog ${APACHE_LOG_DIR}/lxd.example.net.log vhost_combined5 CustomLog /var/log/apache2/lxd.example.net.log vhost_combined
6 DocumentRoot /srv/lxd.example.net/www6 DocumentRoot /srv/lxd.example.net/www
77
8 <Location />8 <Location />
@@ -61,7 +61,7 @@
61 ServerName lxd.example.net61 ServerName lxd.example.net
62 ServerAlias uk.lxd.example.net62 ServerAlias uk.lxd.example.net
63 ServerAlias us.lxd.example.net63 ServerAlias us.lxd.example.net
64 CustomLog ${APACHE_LOG_DIR}/lxd.example.net.log vhost_combined64 CustomLog /var/log/apache2/lxd.example.net.log vhost_combined
65 DocumentRoot /srv/lxd.example.net/www65 DocumentRoot /srv/lxd.example.net/www
6666
67 <Location />67 <Location />

Subscribers

People subscribed via source and target branches