Commit Graph
4565 Commits
Author SHA1 Message Date
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
bmw ff81e0ea99 Merge pull request #1978 from letsencrypt/release-tag
release.sh: stage version changes to letsencrypt/ !
2015-12-23 11:34:44 -05:00
bmw d6003e26fa Merge pull request #1971 from letsencrypt/testfarm
Import letstest test farm (with less git magic)
2015-12-23 11:33:39 -05:00
bmw 0bbe7c235b Merge pull request #1965 from Natim/patch-1
Update the ACME github repository URL.
2015-12-23 11:26:43 -05:00
bmw e3df80cfc0 Merge pull request #1941 from SwartzCr/issue_988
fix logging level error for renewer
2015-12-23 11:20:11 -05:00
bmw fe29245b5e Merge pull request #1932 from P1sec/master
Root prompt explanation + minor typos
2015-12-23 10:22:02 -05:00
bmw fca05bd716 Merge pull request #1952 from cure/patch-2
fix typo in using.rst
2015-12-23 10:20:48 -05:00
Rémy HUBSCHERandRémy HUBSCHER ebfe1254ea Update the ACME github repository URL. 2015-12-23 13:54:58 +01:00
Peter Eckersley d348d4c051 Merge pull request #1914 from Natim/remove-InvalidPlatformWarning
Guarantee a true SSLContext object with Python 2
2015-12-22 18:18:30 -08:00
Peter Eckersley f89ea01861 Merge pull request #1908 from letsencrypt/py26
Removes py26reqs.txt and git dependency
2015-12-22 17:59:59 -08:00
Peter Eckersley b1a393942b Merge pull request #1953 from cure/patch-3
Suppress spurious output
2015-12-22 16:34:45 -08:00
Peter Eckersley 10c7094849 Merge pull request #1954 from cure/patch-4
Fix typo in comment
2015-12-22 16:27:58 -08:00
Peter Eckersley 14bcc8be6b Merge pull request #1990 from domcleal/1960-augeas-rewrite-quote
Add passing test for quote inside RewriteRule
2015-12-22 15:56:47 -08:00
Peter Eckersley 9180322989 Merge pull request #1980 from letsencrypt/1979
When permissions don't work (maybe you're root), disable a unit test that assumes permissions work
2015-12-22 15:55:14 -08:00
Peter Eckersley f5cf58f42e with .. open .. as # definitely nicer 2015-12-22 15:42:53 -08:00
Peter Eckersley 420cd1a106 Merge pull request #1961 from SwartzCr/issue_1208
Support Apache 2.2
2015-12-22 14:27:40 -08:00
Dominic Cleal bccff905db Add passing test for quote inside RewriteRule
Already fixed recently by commit a72e498.

Closes: #1960
2015-12-22 22:14:53 +00:00
Peter Eckersley 28fef227eb Final tweaks
And a third kind of silence
2015-12-22 11:26:49 -08:00
Peter Eckersley eaa6a51f0f A different kind of silence 2015-12-22 11:23:36 -08:00
Peter Eckersley 092b906dee Fix the prettyprinted note 2015-12-22 11:21:36 -08:00
Joona HoikkalaandPeter Eckersley 67c0c454b4 Fixed bug in bootstrapping script 2015-12-22 11:07:07 -08:00
Joona Hoikkala 7b05d573f2 Abstracted the -D DUMP_RUN_CFG command to use os specific one, defined in constants 2015-12-22 10:32:18 +02:00
Peter Eckersley e41339cda8 Keep lint happy
(But what about py3?)
2015-12-21 20:01:28 -08:00
Peter Eckersley aa6bf73d4a Only test permission failures if we're not root
or, more generally, if we're on a system where permissions are being enforced

Closes: #1979
2015-12-21 19:58:07 -08:00
Peter Eckersley 527eb82e6e Install backports, even if they were already present 2015-12-21 18:28:36 -08:00
Peter Eckersley 61816a4029 Give the user some warning before enabling backports 2015-12-21 18:28:05 -08:00
Noah Swartz 50aa5e94d3 Merge remote-tracking branch 'mainline/master' into issue_988 2015-12-21 16:59:08 -08:00
Peter Eckersley 4233353651 release.sh stage version changes to letsencrypt/ !
Fixes: #1966
2015-12-21 16:41:57 -08:00
Noah Swartz ca39b0d125 fixed linting problems 2015-12-21 14:39:14 -08:00
Joona Hoikkala 9739a0f10e Merge remote-tracking branch 'upstream/master' into multios_apache 2015-12-21 23:53:08 +02:00
Joona Hoikkala 52167475df Get pass version to parser and ignore CLI checks for define for 2.2 as it returns empty results anyway 2015-12-21 23:51:22 +02:00
Joona Hoikkala 9e8f3cc644 Add gentoo fingerprint 2015-12-21 22:52:32 +02:00
Peter Eckersley d0810a1306 Merge remote-tracking branch 'letstest/git-move-to-subdir' into testfarm 2015-12-21 11:15:35 -08:00
Peter Eckersley 87dfe8c2b2 Move everything into tests/letstest 2015-12-21 11:12:01 -08:00
Rémy HUBSCHER 212f04fd92 @kuba review 2015-12-20 16:03:12 +01:00
Ward Vandewege cd7051323f Fix typo in comment 2015-12-18 21:27:24 -05:00
Ward Vandewege 55d1f68c77 Suppress spurious output
Suppress spurious output while testing for the presence of the virtualenv or python-virtualenv package.
2015-12-18 21:17:05 -05:00
Ward Vandewege 483ab16f57 fix typo in using.rst 2015-12-18 20:34:35 -05:00
bmw 0c704fa7f2 Merge pull request #1929 from SwartzCr/config-parse
fix issue with parsing renewal confs
2015-12-18 11:41:44 -08:00
Brad Warren accbe779d5 Merge branch 'openbsd' 2015-12-18 11:31:24 -08:00
bmw d89131b7ce Merge pull request #1828 from mgedmin/patch-2
Abort when no Pythons are found
2015-12-18 11:21:22 -08:00
Peter Eckersley 9f02f264c5 test_tox : run unit tests through tox 2015-12-18 11:07:39 -08:00
Peter Eckersley e885536f9d Move module installation inside the test script 2015-12-18 10:13:15 -08:00
Peter Eckersley a4506e15f0 Merge pull request #1945 from domcleal/1934-augeas-arg-quotes
Merge Augeas lens fix for quotes in directive arguments
2015-12-18 01:04:14 -08:00
Dominic Cleal a72e498c97 Merge Augeas lens fix for quotes in directive arguments
From https://github.com/hercules-team/augeas/commit/d4d7ea97718c09c5968277aba08d5e47b971b2ac

Closes: #1934
2015-12-18 08:11:19 +00:00
Dominic Cleal 3e7072e131 Add failing test from ticket #1934
Augeas fails to parse a directive argument with a quote inside (expecting
either fully quoted or unquoted values).
2015-12-18 08:09:00 +00:00
Noah Swartz 79432fddc3 undo previous logger changes 2015-12-17 16:40:56 -08:00
Noah Swartz c66f328253 Merge branch 'issue_988' of https://github.com/SwartzCr/letsencrypt into issue_988 2015-12-17 16:38:36 -08:00
Noah Swartz 5f43c6d356 Merge branch 'config-parse' into issue_988 2015-12-17 16:01:57 -08:00
Noah Swartz e463fca34d fix broken test 2015-12-17 16:01:21 -08:00