Torsten Bögershausen
b7c00a889a
.gitattributes: EOL=LF overrides auto
...
The line
* text=auto eol=lf
in .gitattributes does not work as expected:
setting eol=lf overrides text=auto, and works as
* eol=lf
or
* text eol=lf
This is not what is intended, as binary files like *.gz go through
a CRLF -> LF conversion at commit time.
Use
* crlf=auto
instead (which is even understood by older Git versions, which are still in use)
2016-01-10 18:31:49 +01: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
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
Peter Eckersley
fc3acc69b6
Try updating augeas-lenses as well
2016-01-07 19:12:19 -08:00
Brad Warren
639cbeb7d0
sans_text_dump_comment += 1
2016-01-07 21:11:09 -05:00
Jakub Warmuz
dba69d079f
Separate pylintrc for acme
2016-01-07 22:20:46 +00:00
Jakub Warmuz
cc168c8ef1
Generate fresh pylintrc
...
pylint 1.4.2, -generate-rcfile
2016-01-07 22:17:42 +00:00
Brad Warren
946f4474da
Add warning about multiple SANs extensions
2016-01-07 16:45:46 -05:00
Brad Warren
f09d3ac8b2
Merge branch 'master' into pyopenssl
2016-01-07 16:30:40 -05:00
Brad Warren
32957cc5ec
Comment _pyopenssl_cert_or_req_san method
2016-01-07 16:25:23 -05:00
Jakub Warmuz
6548f343bf
Add invalidEmail error type to acme
...
Related to:
- #1923
- https://github.com/ietf-wg-acme/acme/pull/65
2016-01-07 21:20:25 +00:00
Brad Warren
710eb59f41
Fix IDN CSR test name
2016-01-07 16:19:21 -05:00
Peter Eckersley
9961686476
We might need -t afterall
2016-01-07 10:09:20 -08:00
Brad Warren
0f239e0029
Add comment about dependency version
2016-01-07 13:04:29 -05:00
Brad Warren
caf9b1f261
Clarify _get_idn_sans method
2016-01-07 13:00:29 -05:00
Peter Eckersley
154cd47c83
precision
2016-01-07 09:52:10 -08:00
Peter Eckersley
491a08e4d4
fixen
2016-01-07 09:46:45 -08:00
Peter Eckersley
dc7f479fe3
[deb bootstrap] Add precise-backports for libaugeas0
2016-01-07 09:44:13 -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
Reinaldo de Souza Jr
e7da21eec0
Makes NginxParser aware of directive
...
Fixes #2059
2016-01-07 11:57:00 -05:00
Peter Eckersley
fffe965d68
Merge pull request #2018 from letsencrypt/faster-testfarm
...
[letstest] create and reuse a persistent boulder AMI
2016-01-07 07:40:42 -08:00
Brad Warren
a815ddbafd
Remove excessive newline
2016-01-07 10:05:33 -05:00