Commit Graph
4594 Commits
Author SHA1 Message Date
Jacob Hoffman-Andrews e722a38197 Clarify parser check for duplicate values. 2016-01-04 11:18:13 -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
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 6029bd5fe4 Merge pull request #2013 from letsencrypt/testfarm
Fixes to test farm scripts
2015-12-25 03:20:15 -08:00
Joona Hoikkala 155469b51c Merge remote-tracking branch 'upstream/master' into multios_apache 2015-12-25 10:18:56 +02:00
Joona Hoikkala c728219bc9 Changed define and version commands from string to list to avoid unneeded parsing later on 2015-12-25 10:18:24 +02:00
Peter Eckersley e3263557d2 Merge pull request #2007 from Natim/remove-requests-from-setup.py
Move validator to compatibility-test — Refs #1997
2015-12-24 12:53:54 -08:00
Peter Eckersley 32f2e2f326 Merge pull request #2009 from SwartzCr/issue_2002
Issue 2002
2015-12-24 12:37:01 -08:00
Noah Swartz ea2c86b926 fixed linting and added logger 2015-12-23 16:08:33 -08:00
Rémy HUBSCHER 6a026597f4 Move validator to compatibility-test — Refs #1997 2015-12-24 00:41:27 +01:00
Peter Eckersley 49721c7d01 Merge remote-tracking branch 'letstest/upgrade-test' into testfarm 2015-12-23 15:14:30 -08:00
Noah Swartz 49f36f8071 also debug the written conf file 2015-12-23 14:57:14 -08:00
Peter Eckersley 8f844928b7 Make sure we install realpath
(some systems don't have it :/)
2015-12-23 14:42:26 -08:00
bmw 0befd246fd Merge pull request #2004 from letsencrypt/no-hsts-subdomains
--hsts should not use includeSubDomains
2015-12-23 16:33:26 -05:00
Peter Eckersley 263f6d6429 We don't want to hardcode a letsencrypt-auto venv anymore 2015-12-23 12:26:22 -08:00
Peter Eckersley 8b50274d88 --hsts should not use includeSubDomains
Fixes #1728
2015-12-23 11:33:39 -08:00
Peter Eckersley ee5206fe5a Merge pull request #1999 from letsencrypt/letsignore
Ignore letstest log directories and key files
2015-12-23 11:15:26 -08:00
Peter Eckersley 70cc516ed8 Avoid scrollback for investigating logs 2015-12-23 10:38:57 -08:00
Noah Swartz c9b9b0edda add debug statement 2015-12-23 10:31:31 -08:00
Joona Hoikkala c29c6c96ae Fix tests to complete the merge 2015-12-23 20:08:44 +02:00
Joona Hoikkala 2366b29755 Fix the flow let #1961 and #1811 coexist 2015-12-23 20:07:15 +02:00
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 d4f63097d6 Merge pull request #1959 from convissor/master
Keep storage.names() from passing None to open()
2015-12-23 13:02:33 -05:00
Brad Warren 4156d1cecc Ignore log directories and key files 2015-12-23 12:28:57 -05: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 91f53dc8db Fix various bugs 2015-12-22 18:57:37 -08: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 237472c361 Do things in the correct and new-fashioned way 2015-12-22 17:09:45 -08:00
Peter Eckersley 23e8d6c641 When testing apache2, don't use letsencrypt-auto 2015-12-22 16:57:08 -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