From 6c0b1e46d7ef18fa00defb83b14005686b27e147 Mon Sep 17 00:00:00 2001
From: Peter Eckersley <pde@eff.org>
Date: Mon, 18 Jan 2016 11:42:52 -0800
Subject: [PATCH] Import latest upstream augeas lens

* Handles perl sripts embedded in Apache conf files
* Fixes: #2079
---
 .../letsencrypt_apache/augeas_lens/httpd.aug          | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/letsencrypt-apache/letsencrypt_apache/augeas_lens/httpd.aug b/letsencrypt-apache/letsencrypt_apache/augeas_lens/httpd.aug
index 0f2cb7b45..edaca3fef 100644
--- a/letsencrypt-apache/letsencrypt_apache/augeas_lens/httpd.aug
+++ b/letsencrypt-apache/letsencrypt_apache/augeas_lens/httpd.aug
@@ -106,11 +106,17 @@ let section (body:lens) =
     let inner = (sep_spc . argv arg_sec)? . sep_osp .
              dels ">" . opt_eol . ((body|comment) . (body|empty|comment)*)? .
              indent . dels "</" in
-    let kword = key word in
-    let dword = del word "a" in
+    let kword = key (word - /perl/i) in
+    let dword = del (word - /perl/i) "a" in
         [ indent . dels "<" . square kword inner dword . del />[ \t\n\r]*/ ">\n" ]
 
+let perl_section = [ indent . label "Perl" . del /<perl>/i "<Perl>"
+                   . store /[^<]*/
+                   . del /<\/perl>/i "</Perl>" . eol ]
+
+
 let rec content = section (content|directive)
+                | perl_section
 
 let lns = (content|directive|comment|empty)*
 
@@ -121,6 +127,7 @@ let filter = (incl "/etc/apache2/apache2.conf") .
              (incl "/etc/apache2/conf-available/*.conf") .
              (incl "/etc/apache2/mods-available/*") .
              (incl "/etc/apache2/sites-available/*") .
+             (incl "/etc/apache2/vhosts.d/*.conf") .
              (incl "/etc/httpd/conf.d/*.conf") .
              (incl "/etc/httpd/httpd.conf") .
              (incl "/etc/httpd/conf/httpd.conf") .