Commit Graph
4668 Commits
Author SHA1 Message Date
Jakub Warmuz a367c98409 Merge remote-tracking branch 'github/letsencrypt/master' into acme-pylint 2016-01-09 12:50:13 +00: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
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
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
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
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
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
Peter Eckersley b80d063d55 Merge pull request #2010 from letsencrypt/better-errors
Show error detail to the user.
2016-01-06 12:21:23 -08:00
Peter Eckersley ab9fa6c4c0 Merge pull request #2095 from twstrike/coverage
Add more tests to nginx plugin
2016-01-06 07:53:25 -08:00
Peter Eckersley 2f195cb9f3 Merge pull request #2062 from jsha/nginx-nodupe
Better Nginx error handling.
2016-01-05 17:42:21 -08:00
Jacob Hoffman-Andrews 0a04efe40c Fix lint error and remove extra format() 2016-01-05 17:23:32 -08:00
bmw 4c28fc417c Merge pull request #2073 from alex/more-typos
Fixed a pair of typos in docstrings
2016-01-05 18:02:19 -05:00
bmw b57371a31d Merge pull request #2072 from alex/patch-1
Fixed a typo in a comment
2016-01-05 17:53:51 -05:00
Peter Eckersley b1de1cd289 Merge pull request #2093 from watercrossing/mixedListenFix
Fix for another apache configuration `Listen` special case
2016-01-05 12:32:31 -08:00
Reinaldo de Souza Jr 20829e05ed Add missing test condition for prepare() 2016-01-05 15:15:29 -05:00
Reinaldo de Souza Jr adcb7934ae Improve choose_vhost() test by verifying the output file 2016-01-05 14:55:10 -05:00
Reinaldo de Souza Jr cf74446b58 Add test for redirect enhancement 2016-01-05 14:54:48 -05:00
Jacob Hoffman-Andrews 4adc282631 Fix formatting of error messages. 2016-01-05 11:02:58 -08:00
Jacob Hoffman-Andrews f7fad9a4af Show error detail to the user.
Previously this code would show the user a hardcoded message based on the error
type, but it's much more useful to show the error detail field, which often
helps debug the problem.
2016-01-05 10:51:59 -08:00
watercrossing 4d3d6ff031 Fix for listen bug 2016-01-05 16:51:34 +00:00
Jacob Hoffman-Andrews e722a38197 Clarify parser check for duplicate values. 2016-01-04 11:18:13 -08:00
Alex Gaynor 0454031cce Fixed a pair of typos in docstrings 2016-01-03 14:37:08 -05:00
Alex Gaynor dc3a2da9b1 Fixed a typo in a comment 2016-01-03 10:49:50 -05:00
Peter Eckersley be4d56c353 Merge pull request #2041 from kuba/ietf-gh-pages
Use GH pages for IETF spec repo link
2016-01-02 18:07:25 -08: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
Peter Eckersley fcf79319ff Merge pull request #2042 from kuba/example-server-uri-dev
Staging URI in dev-cli.ini example
2016-01-02 17:46:59 -08:00
Peter Eckersley 082df18e26 Merge pull request #2038 from joohoi/apache_constants
Abstract the remaining OS specific constants from the code
2016-01-02 17:45:51 -08:00
Jacob Hoffman-Andrews 8f984bd24f Better Nginx error handling.
Raise MisconfigurationError on restart failure, so we don't attempt to continue
with an authorization we know will fail.

Log at debug level the config files that are about to be written out, so it's
easier to debug restart failures.

Fix https://github.com/letsencrypt/letsencrypt/issues/942:
Error out if adding a conflicting directive.

Remove unnecessarily-inserted access_log and error_log directives. These were
added to make integration testing easier but are no longer needed. Incidentally
this makes the plugin work with some configs where it wouldn't have worked
previously.

Change the semantics of add_server_directives with replace=True so only the
first instance of a given directive is replaced, not all of them. This works
fine with the one place in the code that calls add_server_directives with
replace=True, because all of the involved directives aren't allowed to be
duplicated in a given block.

Make add_http_directives do inserts into the structure itself, since its needs
were significantly different than the more general add_server_directives. This
also allows us to narrow the scope of the `block.insert(0, directive)` hack that
we inserted to work around https://trac.nginx.org/nginx/ticket/810, since it's
only necessary for http blocks.
2016-01-01 23:09:44 -08:00
Jakub Warmuz 7788799a9b Staging URI in dev-cli.ini example 2015-12-29 08:55:13 +00:00
Jakub Warmuz fd4f6fb2ee Use GH pages for IETF spec repo link 2015-12-29 08:47:14 +00: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 f20cd73e8d For now, disable apacheconftest in travis :( 2015-12-26 20:16:41 -08: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 3e762483c5 Merge pull request #2021 from letsencrypt/revert-2009-issue_2002
Revert "Issue 2002" (logging function was actually calling an interactive iDisplay notification)
2015-12-25 13:25:42 -08:00
Peter Eckersley d6dcfa7b7f Revert "Issue 2002" 2015-12-25 13:18:19 -08:00
Peter Eckersley df56e850d3 Merge remote-tracking branch 'origin/master' into faster-testfarm 2015-12-25 11:38:43 -08:00