372 Commits

Author	SHA1	Message	Date
Joona Hoikkala	503787808a	Merge remote-tracking branch 'upstream/master' into apache_pep8	2016-01-15 09:22:15 +02:00
Brad Warren	2939b62f24	Stop cover from failing	2016-01-14 16:59:29 -08:00
Brad Warren	b7b3f24da0	Convert sites-enabled files to symlinks	2016-01-14 16:35:20 -08:00
Joona Hoikkala	5357a556eb	PyLint doesn't play well with six	2016-01-14 14:18:36 +02:00
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	fe8a0dcef2	Make linter happy	2016-01-14 01:52:35 +02:00
Joona Hoikkala	8c110e31d7	Fixed tests	2016-01-14 01:30:34 +02:00
Joona Hoikkala	8f6ef8db53	Modified error message	2016-01-14 01:10:50 +02:00
Joona Hoikkala	d0832f7414	Added the missing test	2016-01-14 01:09:28 +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	b28b5b08d7	More tests; Make Nose happy	2016-01-11 20:59:19 +00:00
sagi	4645bf8329	Make lint happy	2016-01-11 20:58:52 +00:00
sagi	9c2a0362a7	Add rewrite tests: normal, small, quoted, etc.	2016-01-11 19:55:55 +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	bf74b2cc64	Change test RewriteRule so that it conforms with Apaches spec.	2016-01-11 19:12:30 +00:00
sagi	20433db0bb	Merge remote-tracking branch 'upstream/master' into bugfix_skeleton	2016-01-11 17:36:45 +00:00
Joona Hoikkala	39e4053b82	Removed some now obsolete mock code from tests	2016-01-10 19:15:09 +02:00
Joona Hoikkala	f5862a7a4f	Parse all included paths in apache root configuration	2016-01-10 18:38:53 +02:00
Peter Eckersley	bf4793039a	Merge remote-tracking branch 'origin/master' into pyopenssl	2016-01-10 02:39:54 -08:00
Peter Eckersley	e58fc0aaa6	Merge pull request #2110 from letsencrypt/precise-bootstrap ... Precise bootstrap	2016-01-10 02:36:10 -08:00
Peter Eckersley	5146a766c7	Merge pull request #2092 from joohoi/augeas_paths ... Select broader wildcard matching pattern for augeas paths if overlapping	2016-01-10 02:15:10 -08:00
Peter Eckersley	313dda65e1	Merge branch 'master' into precise-bootstrap	2016-01-08 14:41:50 -08:00
Brad Warren	a7a7380110	Merge branch 'master' into pyopenssl	2016-01-08 14:26:13 -05:00
Noah Swartz	2c8d042974	added in tls_sni logging from #2002	2016-01-08 04:58:17 -08: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
Brad Warren	0f239e0029	Add comment about dependency version	2016-01-07 13:04:29 -05:00
Peter Eckersley	4bdd96a29e	Verbosity	2016-01-07 08:59:53 -08:00
Peter Eckersley	bbf25a2c5e	Setenvif may be required for conf tests on ubuntu 12.04?	2016-01-07 08:57:13 -08:00
watercrossing	4d3d6ff031	Fix for listen bug	2016-01-05 16:51:34 +00:00
Joona Hoikkala	ffeef67e54	Use lists to handle multiple different matching wildcards in same directory	2016-01-05 14:36:42 +02:00
Joona Hoikkala	32d5375b9b	Change test to check out adding a file not already in the augeas paths	2016-01-05 13:21:18 +02:00
Joona Hoikkala	63f311eea4	Refactored the checking method to be easier to read	2016-01-05 13:16:49 +02:00
Joona Hoikkala	10a49532ae	Add / replace functionality to augeas transform paths to overwrite old narrower scope if needed	2016-01-05 11:25:21 +02:00
sagi	a718cfede0	Copy only relevant lines from http vhost to ssl vhost skeleton	2016-01-03 22:03:47 +00:00
Peter Eckersley	b6531afb8d	Merge pull request #1992 from letsencrypt/apache-conf-test ... Apache conf tests in travis	2016-01-02 17:49:38 -08:00
Joona Hoikkala	3fadfb5444	Fixed the find exe condition	2015-12-28 15:56:24 +02:00
Joona Hoikkala	ab069741f2	Fix tests	2015-12-28 14:03:50 +02:00