Commit Graph
5574 Commits
Author SHA1 Message Date
Brad Warren 751b5e253b Merge branch 'master' into fix-indentation 2016-02-23 16:47:43 -08:00
Peter Eckersley f86ae1c461 Merge pull request #2530 from domcleal/2525-augeas-section-continuations
Merge Augeas lens fix for continuations in section headings
2016-02-23 15:56:12 -08:00
Peter Eckersley ce377f1a46 Merge pull request #2506 from TheNavigat/acttravis
Enabling apache-conf-test in Travis
2016-02-23 15:53:58 -08:00
Brad Warren 34685a8558 Fix indendation 2016-02-23 15:53:56 -08:00
Peter Eckersley 7c85d431bc Merge pull request #2514 from thanatos/style-dont-mix-tabs-n-spaces
Don't mix tabs & spaces in Python.
2016-02-23 15:53:16 -08:00
bmw f5a2a94ed5 Merge pull request #2489 from letsencrypt/issue_2455
Fix apache 2.2 redirect problems (Issue 2455) [needs minor revision]
2016-02-23 11:40:47 -08:00
bmw 3c43698280 Merge pull request #2486 from erikrose/peep-3.1.1
Upgrade peep to 3.1.1.
2016-02-23 08:17:57 -08:00
bmw 9f6ab814dd Merge pull request #2529 from rolandshoemaker/set-csr-version
Set CSR version in make_csr
2016-02-23 08:08:23 -08:00
Dominic Cleal 40bca477a5 Merge Augeas lens fix for continuations in section headings
From https://github.com/hercules-team/augeas/commit/0b22176535809f6e8aba3191a809f122e08bc7d0

Closes: #2525
2016-02-23 09:37:35 +00:00
Dominic Cleal 6d1b0298ac Add failing test from ticket #2525
Augeas fails to parse the last new line/continuation between an IP in a
VirtualHost block and the closing `>` of the section.
2016-02-23 09:35:29 +00:00
Roland Shoemaker 7aa5edb212 Set CSR version in make_csr 2016-02-22 21:31:14 -08:00
Noah Swartz 77d606d8aa Merge pull request #2510 from letsencrypt/temp-saves-only-plz
Temporary saves only
2016-02-22 18:17:43 -08:00
Noah Swartz b81079be3b brad nits 2016-02-22 18:08:06 -08:00
Peter Eckersley 9f5f3e802f Merge pull request #2509 from erikrose/no-symlink-le-auto
Turn the root-level letsencrypt-auto symlink into a regular file. Close #2501.
2016-02-22 18:00:25 -08:00
bmw 22d6a9e8d9 Merge pull request #2105 from phispi/test_apache_modules
Added some standard apache2 modules that make tests fail.
2016-02-22 16:33:37 -08:00
Noah Swartz 81deb905bd Merge pull request #2511 from letsencrypt/no-double-transform
Match globs properly
2016-02-22 15:37:09 -08:00
bmw 356cf890e6 Merge pull request #2482 from pfeyz/acme-example-client-fix
wrap csr in ComparableX509
2016-02-22 09:55:08 -08:00
bmw 38416c59df Merge pull request #2138 from kuba/acme-pep8-enfore
Enforce PEP8 checking in ACME [needs revision]
2016-02-22 09:45:42 -08:00
Jakub Warmuz 29d16b027e Separate pep8 config for acme. 2016-02-20 11:01:25 +00:00
Jakub Warmuz 9d9ca27b68 Merge remote-tracking branch 'github/letsencrypt/master' into acme-pep8-enfore 2016-02-20 10:36:50 +00:00
Roy Wellington Ⅳ 9f372bfa38 Don't mix tabs & spaces in Python.
It's a bit silly, and might cause someone a lot of grief to debug.
2016-02-20 01:38:45 -08:00
bmw cf3343605a Merge pull request #2345 from letsencrypt/ignore-letstest-venv
Ignore venv in letstest dir
2016-02-19 18:50:55 -08:00
Brad Warren f9a3abeeae fixes #2247 2016-02-19 17:58:37 -08:00
Peter Eckersley f018895d72 Merge pull request #2487 from letsencrypt/undefined-addrs
Fixes #2470
2016-02-19 12:27:45 -08:00
Brad Warren 0062678f7d A temporary save is a good save 2016-02-19 12:20:32 -08:00
Erik Rose b95a01a15c Turn the root-level letsencrypt-auto symlink into a regular file. Close #2501.
It will always be a copy of the latest release version, 0.4 in this case. (Modify the release script to make that so.) This way, people using the old method of running le-auto from a git checkout will not end up using a bleeding-edge version, letting us work on the tip-of-tree version more freely.
2016-02-19 15:13:58 -05:00
TheNavigat 0e12b1fd86 Enabling apache-conf-test in Travis 2016-02-19 05:00:47 +02:00
Peter Eckersley 9b21efc6b8 Merge pull request #2480 from filipochnik/remove-acme-challenge
Remove acme-challenge after cleaning up all challenges
2016-02-18 12:43:13 -08:00
Brad Warren 6135ba7a59 break 2016-02-17 17:24:57 -08:00
Peter Eckersley 4dad0d76f6 Merge pull request #2494 from moshevds/travis_yml
Removed a mention of SimpleHTTP from comments
2016-02-17 16:23:46 -08:00
bmw 960114a08e Merge pull request #2282 from olabini/nginx_reverter_guarding
Guard reverter invocations and wrap in correct exceptions
2016-02-17 16:04:29 -08:00
Filip Ochnik 0554163ff9 Additional tests for webroot cleanup 2016-02-17 17:21:25 +08:00
Filip Ochnik 4d9f487e89 Handle rmdir failure 2016-02-17 17:04:10 +08:00
Môshe van der Sterre 560ad7152d Removed a mention of SimpleHTTP from comments 2016-02-17 06:38:07 +01:00
TheNavigat ceb02f9731 Merge remote-tracking branch 'letsencrypt/master' 2016-02-17 04:50:15 +02:00
schoen e09398c9a8 Merge pull request #2492 from letsencrypt/unbreak-le-auto
Revert "Let --no-self-upgrade bootstrap OS packages. Fix #2432."
2016-02-16 18:21:48 -08:00
Brad Warren dbc81490e5 Revert "Let --no-self-upgrade bootstrap OS packages. Fix #2432."
This reverts commit 6eb2d60166.
2016-02-16 17:10:59 -08:00
Peter Eckersley 8baf3b3750 Merge pull request #2449 from nneonneo/support-osx-apache
Support system-default Apache on OS X. Tested on Yosemite (10.10).
2016-02-16 16:50:01 -08:00
Noah Swartz c8a9da8442 update test to hit new line in configurator 2016-02-16 16:47:29 -08:00
Peter Eckersley 1a77c73857 Merge pull request #2472 from TheNavigat/clienttest
Tests for client.py
2016-02-16 16:18:21 -08:00
Peter Eckersley ceae505751 Merge pull request #2476 from moshevds/etc_hosts
Adding required /etc/hosts entries to .travis.yml and docs/contributing.rst
2016-02-16 16:15:32 -08:00
Peter Eckersley 314f9f4755 Merge pull request #2475 from moshevds/perform_method_documentation
Updating perform method documentation in interfaces.py
2016-02-16 16:14:45 -08:00
Noah Swartz 109d6caf65 fix how OR is added 2016-02-16 16:07:03 -08:00
Noah Swartz bf30e54a32 fix syntax and don't have unneeded ors 2016-02-16 15:58:53 -08:00
Peter Eckersley a105f8e607 Merge pull request #2484 from letsencrypt/explain_no_ip_certs
Explain IP addresses are specifically forbidden
2016-02-16 15:54:34 -08:00
Noah Swartz 3964357eb3 rewrite generic files 2016-02-16 15:48:36 -08:00
Brad Warren 36c6f734a8 fix #2470 2016-02-16 14:56:26 -08:00
Erik Rose c71fa44456 Upgrade peep to 3.1.1.
Fix bad LE experience reported at https://github.com/erikrose/peep/issues/119.
2016-02-16 17:51:08 -05:00
Seth Schoen 31a27f675a Trivial change to re-run tests after spurious integration test failure 2016-02-16 14:41:02 -08:00
Seth Schoen 16761bc836 Fix lint line-too-long complaint 2016-02-16 13:00:08 -08:00