Ubuntu Mirror Charm

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

  1. Git
  2. lp:~pjdc/ubuntu-mirror-charm/+git/ubuntu-mirror-charm
  3. linuxcontainers-directory-stanza
  4. Merge into master
Proposed by Paul Collins
Status: Merged
Approved by: Paul Collins
Approved revision: 8a4f1c709855151778b387b5826540af6374839c
Merged at revision: eca17946253f74119e7fae0a02889dfbb45ef1a8
Proposed branch: ~pjdc/ubuntu-mirror-charm/+git/ubuntu-mirror-charm:linuxcontainers-directory-stanza
Merge into: ubuntu-mirror-charm:master
Diff against target: 205 lines (+99/-0)
4 files modified
templates/apache-linuxcontainers-directory.include.tmpl (+7/-0)
templates/apache-linuxcontainers.tmpl (+4/-0)
tests/unit/testdata/linuxcontainers/linuxcontainers.txt (+72/-0)
tests/unit/testdata/linuxcontainers/thirdparty.txt (+16/-0)
Reviewer Review Type Date Requested Status
Haw Loeung +1 Approve
Canonical IS Reviewers Pending
Review via email: mp+410501@code.launchpad.net

Commit message

allow linuxcontainers VirtualHosts to read their files

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 eca17946253f74119e7fae0a02889dfbb45ef1a8

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/templates/apache-linuxcontainers-directory.include.tmpl b/templates/apache-linuxcontainers-directory.include.tmpl
2new file mode 100644
3index 0000000..a18fc8e
4--- /dev/null
5+++ b/templates/apache-linuxcontainers-directory.include.tmpl
6@@ -0,0 +1,7 @@
7+ FileETag MTime Size
8+ <Directory "/srv/${name}/">
9+ Require all granted
10+ IndexOptions NameWidth=* +SuppressDescription
11+ Options +Indexes +FollowSymLinks
12+ IndexIgnore favicon.ico
13+ </Directory>
14diff --git a/templates/apache-linuxcontainers.tmpl b/templates/apache-linuxcontainers.tmpl
15index f2acf4a..75b9501 100644
16--- a/templates/apache-linuxcontainers.tmpl
17+++ b/templates/apache-linuxcontainers.tmpl
18@@ -29,6 +29,8 @@
19 AllowEncodedSlashes On
20
21 #include 'templates/apache-linuxcontainers-api.include.tmpl'
22+
23+#include 'templates/apache-linuxcontainers-directory.include.tmpl'
24 </VirtualHost>
25
26 #if $name == "lxd.images.canonical.com"
27@@ -49,6 +51,8 @@
28 AllowEncodedSlashes On
29
30 #include 'templates/apache-linuxcontainers-api.include.tmpl'
31+
32+#include 'templates/apache-linuxcontainers-directory.include.tmpl'
33 </VirtualHost>
34
35 #end for
36diff --git a/tests/unit/testdata/linuxcontainers/linuxcontainers.txt b/tests/unit/testdata/linuxcontainers/linuxcontainers.txt
37index ca9f0ce..77f23dd 100644
38--- a/tests/unit/testdata/linuxcontainers/linuxcontainers.txt
39+++ b/tests/unit/testdata/linuxcontainers/linuxcontainers.txt
40@@ -45,6 +45,14 @@
41 </LocationMatch>
42 # Simplestreams: redirect
43 RewriteRule ^/streams(.*)$ /meta/simplestreams$1 [L]
44+
45+ FileETag MTime Size
46+ <Directory "/srv/lxd.images.canonical.com/">
47+ Require all granted
48+ IndexOptions NameWidth=* +SuppressDescription
49+ Options +Indexes +FollowSymLinks
50+ IndexIgnore favicon.ico
51+ </Directory>
52 </VirtualHost>
53
54 <VirtualHost 91.189.88.247:80 [2001:67c:1360:8001::33]:80>
55@@ -94,6 +102,14 @@
56 </LocationMatch>
57 # Simplestreams: redirect
58 RewriteRule ^/streams(.*)$ /meta/simplestreams$1 [L]
59+
60+ FileETag MTime Size
61+ <Directory "/srv/lxd.images.canonical.com/">
62+ Require all granted
63+ IndexOptions NameWidth=* +SuppressDescription
64+ Options +Indexes +FollowSymLinks
65+ IndexIgnore favicon.ico
66+ </Directory>
67 </VirtualHost>
68
69 <VirtualHost 91.189.88.247:80 [2001:67c:1360:8001::33]:80>
70@@ -143,6 +159,14 @@
71 </LocationMatch>
72 # Simplestreams: redirect
73 RewriteRule ^/streams(.*)$ /meta/simplestreams$1 [L]
74+
75+ FileETag MTime Size
76+ <Directory "/srv/lxd.images.canonical.com/">
77+ Require all granted
78+ IndexOptions NameWidth=* +SuppressDescription
79+ Options +Indexes +FollowSymLinks
80+ IndexIgnore favicon.ico
81+ </Directory>
82 </VirtualHost>
83
84 <VirtualHost 91.189.88.247:443 [2001:67c:1360:8001::33]:443>
85@@ -201,6 +225,14 @@
86 </LocationMatch>
87 # Simplestreams: redirect
88 RewriteRule ^/streams(.*)$ /meta/simplestreams$1 [L]
89+
90+ FileETag MTime Size
91+ <Directory "/srv/lxd.images.canonical.com/">
92+ Require all granted
93+ IndexOptions NameWidth=* +SuppressDescription
94+ Options +Indexes +FollowSymLinks
95+ IndexIgnore favicon.ico
96+ </Directory>
97 </VirtualHost>
98
99 <VirtualHost 91.189.88.247:443 [2001:67c:1360:8001::33]:443>
100@@ -259,6 +291,14 @@
101 </LocationMatch>
102 # Simplestreams: redirect
103 RewriteRule ^/streams(.*)$ /meta/simplestreams$1 [L]
104+
105+ FileETag MTime Size
106+ <Directory "/srv/lxd.images.canonical.com/">
107+ Require all granted
108+ IndexOptions NameWidth=* +SuppressDescription
109+ Options +Indexes +FollowSymLinks
110+ IndexIgnore favicon.ico
111+ </Directory>
112 </VirtualHost>
113
114 <VirtualHost 91.189.88.247:443 [2001:67c:1360:8001::33]:443>
115@@ -317,6 +357,14 @@
116 </LocationMatch>
117 # Simplestreams: redirect
118 RewriteRule ^/streams(.*)$ /meta/simplestreams$1 [L]
119+
120+ FileETag MTime Size
121+ <Directory "/srv/lxd.images.canonical.com/">
122+ Require all granted
123+ IndexOptions NameWidth=* +SuppressDescription
124+ Options +Indexes +FollowSymLinks
125+ IndexIgnore favicon.ico
126+ </Directory>
127 </VirtualHost>
128
129 <VirtualHost 91.189.88.247:8443 [2001:67c:1360:8001::33]:8443>
130@@ -375,6 +423,14 @@
131 </LocationMatch>
132 # Simplestreams: redirect
133 RewriteRule ^/streams(.*)$ /meta/simplestreams$1 [L]
134+
135+ FileETag MTime Size
136+ <Directory "/srv/lxd.images.canonical.com/">
137+ Require all granted
138+ IndexOptions NameWidth=* +SuppressDescription
139+ Options +Indexes +FollowSymLinks
140+ IndexIgnore favicon.ico
141+ </Directory>
142 </VirtualHost>
143
144 <VirtualHost 91.189.88.247:8443 [2001:67c:1360:8001::33]:8443>
145@@ -433,6 +489,14 @@
146 </LocationMatch>
147 # Simplestreams: redirect
148 RewriteRule ^/streams(.*)$ /meta/simplestreams$1 [L]
149+
150+ FileETag MTime Size
151+ <Directory "/srv/lxd.images.canonical.com/">
152+ Require all granted
153+ IndexOptions NameWidth=* +SuppressDescription
154+ Options +Indexes +FollowSymLinks
155+ IndexIgnore favicon.ico
156+ </Directory>
157 </VirtualHost>
158
159 <VirtualHost 91.189.88.247:8443 [2001:67c:1360:8001::33]:8443>
160@@ -491,5 +555,13 @@
161 </LocationMatch>
162 # Simplestreams: redirect
163 RewriteRule ^/streams(.*)$ /meta/simplestreams$1 [L]
164+
165+ FileETag MTime Size
166+ <Directory "/srv/lxd.images.canonical.com/">
167+ Require all granted
168+ IndexOptions NameWidth=* +SuppressDescription
169+ Options +Indexes +FollowSymLinks
170+ IndexIgnore favicon.ico
171+ </Directory>
172 </VirtualHost>
173
174diff --git a/tests/unit/testdata/linuxcontainers/thirdparty.txt b/tests/unit/testdata/linuxcontainers/thirdparty.txt
175index 047c44c..1d07086 100644
176--- a/tests/unit/testdata/linuxcontainers/thirdparty.txt
177+++ b/tests/unit/testdata/linuxcontainers/thirdparty.txt
178@@ -47,6 +47,14 @@
179 </LocationMatch>
180 # Simplestreams: redirect
181 RewriteRule ^/streams(.*)$ /meta/simplestreams$1 [L]
182+
183+ FileETag MTime Size
184+ <Directory "/srv/lxd.example.net/">
185+ Require all granted
186+ IndexOptions NameWidth=* +SuppressDescription
187+ Options +Indexes +FollowSymLinks
188+ IndexIgnore favicon.ico
189+ </Directory>
190 </VirtualHost>
191
192 <VirtualHost *:443>
193@@ -107,5 +115,13 @@
194 </LocationMatch>
195 # Simplestreams: redirect
196 RewriteRule ^/streams(.*)$ /meta/simplestreams$1 [L]
197+
198+ FileETag MTime Size
199+ <Directory "/srv/lxd.example.net/">
200+ Require all granted
201+ IndexOptions NameWidth=* +SuppressDescription
202+ Options +Indexes +FollowSymLinks
203+ IndexIgnore favicon.ico
204+ </Directory>
205 </VirtualHost>
206

Subscribers

People subscribed via source and target branches