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
bmw
355563e23c
Merge pull request #2130 from letsencrypt/earlier-renewal
...
Default: renew 30 days before expiry, rather than 10
2016-01-11 12:32:07 -08:00
Peter Eckersley
c89dcad313
This default shouldn't be a magic string
2016-01-11 12:22:22 -08: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
Peter Eckersley
c850481b31
Merge pull request #2134 from joohoi/parse_includes
...
Search all paths included from across the configuration for VirtualHosts
2016-01-11 09:53:34 -08:00
sagi
20433db0bb
Merge remote-tracking branch 'upstream/master' into bugfix_skeleton
2016-01-11 17:36:45 +00:00
Peter Eckersley
c430876d47
Merge pull request #2133 from letsencrypt/precise-bootstrap
...
[bootstrap/_deb_common] Re-fix the always-install-backports
2016-01-11 08:50:38 -08:00
Joona Hoikkala
39e4053b82
Removed some now obsolete mock code from tests
2016-01-10 19:15:09 +02:00
Peter Eckersley
4c02902762
[bootstrap/_deb_common] Re-fix the always-install-backports
...
* This bug seems to come back every time it's fixed :(
2016-01-10 09:03:16 -08:00
Joona Hoikkala
f5862a7a4f
Parse all included paths in apache root configuration
2016-01-10 18:38:53 +02:00
Jakub Warmuz
3cddb15023
Merge remote-tracking branch 'github/letsencrypt/master' into pyopenssl
2016-01-10 11:25:12 +00:00
Jakub Warmuz
1182dcf0c2
Merge remote-tracking branch 'github/letsencrypt/master' into acme-pylint
2016-01-10 11:17:03 +00: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
3a7565afe5
trigger travis rerun
2016-01-10 01:03:50 -08:00
Peter Eckersley
5b3bd890b7
Default: renew 30 days before expiry, rather than 10
...
- gives more time for various fallback strategies if renewal doesn't work the
first time
2016-01-09 15:15:05 -08:00
Peter Eckersley
684ff01124
Merge pull request #2094 from twstrike/enforce-required-fields
...
Warn the user when --chain-path or --fullchain-path are missing but are required [minor revision requested]
2016-01-09 10:55:33 -08:00
Peter Eckersley
00e0355eb7
Merge pull request #2104 from benubois/patch-1
...
Document webroot request path.
2016-01-09 10:54:25 -08:00
Peter Eckersley
eb6dc15067
Merge pull request #2129 from letsencrypt/py3-acme
...
Python 3 Travis testing for acme.
2016-01-09 10:52:16 -08:00
Jakub Warmuz
b26dda3afe
Add Python 3.5 trove classifier to acme
2016-01-09 13:38:12 +00:00
Jakub Warmuz
34010a0168
Python 3.5 needs explicit Travis setting
2016-01-09 13:31:50 +00:00
Jakub Warmuz
7728f4d28a
Python 3 Travis testing for acme.
...
Despite its description,
https://github.com/letsencrypt/letsencrypt/pull/630 , removed not only
Python 2.6 support, but also Travis tests against Python 3. ACME
library supports Python 3 and Travis should tests it.
This must be merged before any pending PRs agains acme library.
2016-01-09 13:24:54 +00:00
Jakub Warmuz
a367c98409
Merge remote-tracking branch 'github/letsencrypt/master' into acme-pylint
2016-01-09 12:50:13 +00:00
Peter Eckersley
705032bc67
[Always] Install augeas-lenses
...
- But do we need the augeas-lenses package?
- Install augeas from backports even if the backports were already available
(this is the third time fixing that bug!)
2016-01-08 19:12:30 -08:00
Peter Eckersley
ed85726071
Merge pull request #2109 from twstrike/fix-2059
...
Makes NginxParser aware of `ssl on` directive
2016-01-08 16:44:44 -08:00
bmw
1a2f42d7d7
Merge pull request #2121 from letsencrypt/revert-2120-cryptography_fix
...
Revert "Don't use cryptography version 1.2"
2016-01-08 18:36:03 -05:00
Peter Eckersley
313dda65e1
Merge branch 'master' into precise-bootstrap
2016-01-08 14:41:50 -08:00
bmw
96b55c8f34
Revert "Don't use cryptography version 1.2"
2016-01-08 17:02:35 -05:00
bmw
e8705720be
Merge pull request #1593 from TheNavigat/read-the-docs-python
...
Adding Python 2.6+ note to docs
2016-01-08 16:33:32 -05:00
Brad Warren
b1e67f241e
Fix merge conflicts properly
2016-01-08 14:31:30 -05:00
Brad Warren
36679c2daa
Merge branch 'master' into pyopenssl
2016-01-08 14:27:07 -05:00
Brad Warren
a7a7380110
Merge branch 'master' into pyopenssl
2016-01-08 14:26:13 -05:00
bmw
67b01d328c
Merge pull request #2120 from letsencrypt/cryptography_fix
...
Don't use cryptography version 1.2
2016-01-08 14:25:39 -05:00
Brad Warren
b039c884d8
Don't use cryptography version 1.2
2016-01-08 14:09:44 -05:00
Peter Eckersley
516ce22ae6
Merge pull request #2116 from SwartzCr/issue_2002
...
don't iDisplay if logging
2016-01-08 11:02:15 -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
89296eca9d
Merge pull request #2112 from kuba/bugs/1923
...
Add invalidEmail error type to acme
2016-01-07 19:15:28 -08:00
Brad Warren