Commit graph

194 commits

Author SHA1 Message Date
Joona Hoikkala
be1d1321b6 Pep8 love 2016-01-14 13:25:15 +02:00
Peter Eckersley
8cc0d156e2 Merge pull request #2171 from letsencrypt/kill-22
Temporarily disable Apache 2.2 support
2016-01-13 16:26:04 -08:00
Brad Warren
8989dfc1ff Disable Apache 2.2 support 2016-01-13 16:17:26 -08:00
Joona Hoikkala
8f6ef8db53 Modified error message 2016-01-14 01:10:50 +02:00
Joona Hoikkala
ddbfb44041 Add tests 2016-01-14 00:50:34 +02:00
Joona Hoikkala
7d51480c4d Remove the test path from augeas even if failing 2016-01-14 00:23:45 +02:00
Joona Hoikkala
30ad7dce9f Pick up the augeas RuntimeError and pass the correct one 2016-01-14 00:06:52 +02:00
Joona Hoikkala
99c575f043 Check augeas version, and raise error if not recent enough 2016-01-13 23:56:22 +02:00
Brad Warren
4cdf63c55e Fix a couple nits 2016-01-11 18:27:01 -08:00
Brad Warren
24e6f4142b Merge branch 'master' into apache-redirect 2016-01-11 18:21:51 -08:00
Brad Warren
10df56bab6 Added revisions 2016-01-11 18:21:33 -08:00
sagi
4645bf8329 Make lint happy 2016-01-11 20:58:52 +00:00
sagi
a43e7b11f1 Add colon 2016-01-11 19:55:15 +00:00
sagi
82a58fec48 Dequote possible quoted target 2016-01-11 19:48:17 +00:00
sagi
ae572fe084 Make lint happy 2016-01-11 19:20:29 +00:00
sagi
6c18a7d318 Revise RewriteRule sifting algorithm 2016-01-11 19:15:23 +00:00
sagi
20433db0bb Merge remote-tracking branch 'upstream/master' into bugfix_skeleton 2016-01-11 17:36:45 +00:00
Joona Hoikkala
f5862a7a4f Parse all included paths in apache root configuration 2016-01-10 18:38:53 +02:00
Noah Swartz
287be6be8e fix linting issue 2016-01-08 02:47:59 -08:00
Noah Swartz
e7ae025a72 fixed mainline merge conflict 2016-01-08 02:36:35 -08:00
Noah Swartz
6fedd22dc8 don't iDisplay if logging 2016-01-08 02:00:47 -08:00
watercrossing
4d3d6ff031 Fix for listen bug 2016-01-05 16:51:34 +00:00
sagi
a718cfede0 Copy only relevant lines from http vhost to ssl vhost skeleton 2016-01-03 22:03:47 +00:00
Joona Hoikkala
3fadfb5444 Fixed the find exe condition 2015-12-28 15:56:24 +02:00
Joona Hoikkala
e3358bb153 Abstract the remaining commands to configurable ones 2015-12-28 13:47:14 +02:00
Peter Eckersley
ffd0d5aa56 Merge pull request #1811 from joohoi/multios_apache
Support apache plugin in different operating systems
2015-12-25 14:50:17 -08:00
Peter Eckersley
d6dcfa7b7f Revert "Issue 2002" 2015-12-25 13:18:19 -08:00
Joona Hoikkala
155469b51c Merge remote-tracking branch 'upstream/master' into multios_apache 2015-12-25 10:18:56 +02:00
Joona Hoikkala
c728219bc9 Changed define and version commands from string to list to avoid unneeded parsing later on 2015-12-25 10:18:24 +02:00
Peter Eckersley
32f2e2f326 Merge pull request #2009 from SwartzCr/issue_2002
Issue 2002
2015-12-24 12:37:01 -08:00
Noah Swartz
ea2c86b926 fixed linting and added logger 2015-12-23 16:08:33 -08:00
Noah Swartz
c9b9b0edda add debug statement 2015-12-23 10:31:31 -08:00
Joona Hoikkala
2366b29755 Fix the flow let #1961 and #1811 coexist 2015-12-23 20:07:15 +02:00
Joona Hoikkala
e7641dcdee Merge remote-tracking branch 'upstream/master' into multios_apache
# Conflicts:
#	letsencrypt-apache/letsencrypt_apache/configurator.py
#	letsencrypt-apache/letsencrypt_apache/parser.py
#	letsencrypt-apache/letsencrypt_apache/tests/configurator_test.py
2015-12-23 20:02:34 +02:00
Peter Eckersley
420cd1a106 Merge pull request #1961 from SwartzCr/issue_1208
Support Apache 2.2
2015-12-22 14:27:40 -08:00
Joona Hoikkala
9739a0f10e Merge remote-tracking branch 'upstream/master' into multios_apache 2015-12-21 23:53:08 +02:00
Joona Hoikkala
52167475df Get pass version to parser and ignore CLI checks for define for 2.2 as it returns empty results anyway 2015-12-21 23:51:22 +02:00
sagi
06643b35a0 Merge remote-tracking branch 'upstream/master' into bugfix_redirect 2015-12-11 12:14:02 +00:00
sagi
2edfc1cd59 simplified augeas get, with parsers get_arg func 2015-12-11 11:59:26 +00:00
sagi
5f05c5104e make lint happy 2015-12-11 11:13:32 +00:00
Joona Hoikkala
4d31a8cb39 Sane error message in case user tries to use apache-handle-sites functionality in non-supported environment. 2015-12-11 12:41:21 +02:00
sagi
ab1e75e426 Change dir_dict to rewrite_args_dict 2015-12-11 10:17:46 +00:00
sagi
23a97b8281 Change iteration on dir_dict 2015-12-11 10:09:16 +00:00
sagi
ad5817c7a9 reason about dir_dict 2015-12-11 10:05:09 +00:00
sagi
4748e1dd1e Name the list of two redirect argument lists 2015-12-11 09:57:08 +00:00
sagi
681de292b7 Switch to using defaultdict(list) 2015-12-11 09:29:02 +00:00
sagi
c594a258fe Change comment on possibility of redirection loops 2015-12-11 09:26:55 +00:00
sagi
b4746e555a typo: an other -> another 2015-12-11 09:18:36 +00:00
Joona Hoikkala
54127eef5a Don't call site enable methods when handle-sites is false for the operating system 2015-12-10 18:12:07 +02:00
Noah Swartz
414cfe9f13 Merge remote-tracking branch 'mainline/master' into issue_1208 2015-12-09 17:10:49 -08:00