312 Commits

Author	SHA1	Message	Date
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	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
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
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
Joona Hoikkala	e3358bb153	Abstract the remaining commands to configurable ones	2015-12-28 13:47:14 +02:00
Joona Hoikkala	83812dc16a	Abstract config file matching to os based constants	2015-12-28 12:56:44 +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
Peter Eckersley	ce9e3c1f94	Some OSes don't enable the mime module by default?	2015-12-23 15:00:07 -08:00
Noah Swartz	49f36f8071	also debug the written conf file	2015-12-23 14:57:14 -08:00
Peter Eckersley	8b50274d88	--hsts should not use includeSubDomains ... Fixes #1728	2015-12-23 11:33:39 -08:00
Peter Eckersley	494e6e7711	Remove TODO that has been done	2015-12-23 10:53:13 -08:00
Peter Eckersley	6db4062619	Split module installation into substeps ... - This may prevent failures if one thing is uninstallable	2015-12-23 10:45:08 -08:00
Noah Swartz	c9b9b0edda	add debug statement	2015-12-23 10:31:31 -08:00
Joona Hoikkala	c29c6c96ae	Fix tests to complete the merge	2015-12-23 20:08:44 +02: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	d9ea151fbb	Tweak the graphite config file so that apacheconftest passes again ... (At least on debian and other systems that have a www-data user...)	2015-12-22 16:04:30 -08:00