starred/certbot-certbot-1
1
0
Fork 0
mirror of https://github.com/certbot/certbot.git synced 2026-08-04 12:32:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

switched the httpd.aug to the version from 1.2

Browse Source
This commit is contained in:
Noah Swartz
2015-11-03 11:08:10 -08:00
parent c0048d7480
commit 60fce0b22e
1 changed files with 6 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
letsencrypt-apache/letsencrypt_apache/httpd.aug
+6 -17
View File
@@ -59,24 +59,17 @@ let empty = Util.empty_dos
let indent = Util.indent let indent = Util.indent
(* borrowed from shellvars.aug *) (* borrowed from shellvars.aug *)
let char_arg_dir = /[^\\ '"\t\r\n]|\\\\"|\\\\'/ let char_arg_dir = /[^ '"\t\r\n]|\\\\"|\\\\'/
let char_arg_sec = /[^ '"\t\r\n>]|\\\\"|\\\\'/ let char_arg_sec = /[^ '"\t\r\n>]|\\\\"|\\\\'/
let cdot = /\\\\./ let dquot = /"([^"\\\r\n]|\\\\.)*"/
let cl = /\\\\\n/ let squot = /'([^'\\\r\n]|\\\\.)*'/
let dquot =
let no_dquot = /[^"\\\r\n]/
in /"/ . (no_dquot|cdot|cl)* . /"/
let squot =
let no_squot = /[^'\\\r\n]/
in /'/ . (no_squot|cdot|cl)* . /'/
let comp = /[<>=]?=/
(****************************************************************** (******************************************************************
* Attributes * Attributes
*****************************************************************) *****************************************************************)
let arg_dir = [ label "arg" . store (char_arg_dir+|dquot|squot) ] let arg_dir = [ label "arg" . store (char_arg_dir+|dquot|squot) ]
let arg_sec = [ label "arg" . store (char_arg_sec+|comp|dquot|squot) ] let arg_sec = [ label "arg" . store (char_arg_sec+|dquot|squot) ]
let argv (l:lens) = l . (sep_spc . l)* let argv (l:lens) = l . (sep_spc . l)*
@@ -84,16 +77,13 @@ let directive = [ indent . label "directive" . store word .
(sep_spc . argv arg_dir)? . eol ] (sep_spc . argv arg_dir)? . eol ]
let section (body:lens) = let section (body:lens) =
(* opt_eol includes empty lines *)
let opt_eol = del /([ \t]*#?\r?\n)*/ "\n" in
let inner = (sep_spc . argv arg_sec)? . sep_osp . let inner = (sep_spc . argv arg_sec)? . sep_osp .
dels ">" . opt_eol . ((body|comment) . (body|empty|comment)*)? . dels ">" . eol . body* . indent . dels "</" in
indent . dels "</" in
let kword = key word in let kword = key word in
let dword = del word "a" in let dword = del word "a" in
[ indent . dels "<" . square kword inner dword . del ">" ">" . eol ] [ indent . dels "<" . square kword inner dword . del ">" ">" . eol ]
let rec content = section (content|directive) let rec content = section (content|directive|comment|empty)
let lns = (content|directive|comment|empty)* let lns = (content|directive|comment|empty)*
@@ -101,7 +91,6 @@ let filter = (incl "/etc/apache2/apache2.conf") .
(incl "/etc/apache2/httpd.conf") . (incl "/etc/apache2/httpd.conf") .
(incl "/etc/apache2/ports.conf") . (incl "/etc/apache2/ports.conf") .
(incl "/etc/apache2/conf.d/*") . (incl "/etc/apache2/conf.d/*") .
(incl "/etc/apache2/conf-available/*.conf") .
(incl "/etc/apache2/mods-available/*") . (incl "/etc/apache2/mods-available/*") .
(incl "/etc/apache2/sites-available/*") . (incl "/etc/apache2/sites-available/*") .
(incl "/etc/httpd/conf.d/*.conf") . (incl "/etc/httpd/conf.d/*.conf") .