Apache2 Subordinate Charm

Merge ~axino/apache2-subordinate-charm/+git/apache2-subordinate-charm:master into apache2-subordinate-charm:master

  1. Git
  2. lp:~axino/apache2-subordinate-charm/+git/apache2-subordinate-charm
  3. master
  4. Merge into master
Proposed by Junien F
Status: Merged
Approved by: Laurent Sesquès
Approved revision: cf8e741ac611a55f2aec478dbd5bdc010b73e637
Merged at revision: dff895b714a56e4dec361c16d32c077523df4c7d
Proposed branch: ~axino/apache2-subordinate-charm/+git/apache2-subordinate-charm:master
Merge into: apache2-subordinate-charm:master
Diff against target: 13 lines (+1/-1)
1 file modified
templates/apache-vhost.j2 (+1/-1)
Reviewer Review Type Date Requested Status
Laurent Sesquès Approve
Review via email: mp+366814@code.launchpad.net

Commit message

remove Indexes option for security reasons cRT#117788

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
Laurent Sesquès (sajoupa) :
review: Approve
Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

Change successfully merged at revision dff895b714a56e4dec361c16d32c077523df4c7d

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/templates/apache-vhost.j2 b/templates/apache-vhost.j2
2index 7526191..b9b4441 100644
3--- a/templates/apache-vhost.j2
4+++ b/templates/apache-vhost.j2
5@@ -44,7 +44,7 @@ Listen *:{{ port }}
6
7 DocumentRoot {{ service['document_root'] }}
8 <Directory {{ service['document_root'] }}>
9- Options Indexes FollowSymLinks MultiViews
10+ Options -Indexes +FollowSymLinks +MultiViews
11 AllowOverride All
12 Require all granted
13 </Directory>

Subscribers

People subscribed via source and target branches