Merge lp:~andreserl/maas/lp1236544 into lp:maas/trunk

Proposed by Andres Rodriguez
Status: Merged
Approved by: Andres Rodriguez
Approved revision: 1672
Merged at revision: 1676
Proposed branch: lp:~andreserl/maas/lp1236544
Merge into: lp:maas/trunk
Diff against target: 13 lines (+3/-1)
1 file modified
contrib/maas-cluster-http.conf (+3/-1)
To merge this branch: bzr merge lp:~andreserl/maas/lp1236544
Reviewer Review Type Date Requested Status
Andres Rodriguez (community) Approve
Scott Moser (community) Approve
Review via email:

Commit message

allow access of static images for both apache2.2 and 2.4

To post a comment you must log in.
Revision history for this message
Andres Rodriguez (andreserl) wrote :

For this to work we also need: lp:~andreserl/maas/packaging_lp1236544

Revision history for this message
Scott Moser (smoser) wrote :

paired with the packaging change this LGTM.

review: Approve
Revision history for this message
Andres Rodriguez (andreserl) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'contrib/maas-cluster-http.conf'
2--- contrib/maas-cluster-http.conf 2013-08-20 15:09:54 +0000
3+++ contrib/maas-cluster-http.conf 2013-10-07 19:31:52 +0000
4@@ -2,6 +2,8 @@
5 # installer needs them
6 Alias /MAAS/static/images/ /var/lib/maas/tftp/
7 <Directory /var/lib/maas/tftp/>
8- Require all granted
9+ <IfVersion >= 2.4>
10+ Require all granted
11+ </IfVersion>
12 SetHandler None
13 </Directory>