github-mirror/caddy
2
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2024-11-26 02:09:47 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity
875 Commits 30 Branches 138 Tags 33 MiB
94e3e7e5eb
Commit Graph

875 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Matthew Holt
0970c058f7 tls: Repair from messy merge 2015-11-02 20:54:38 -07:00
Matthew Holt
ad057ab873 Merge branch 'master' into letsencrypt 
Conflicts:
	caddy/parse/parse.go
	caddy/parse/parsing.go
	config/config.go
	config/setup/controller.go
	main.go
	server/server.go
 2015-11-02 20:26:55 -07:00
Matthew Holt
09341fca12 markdown: Don't generate static site or links unless sitegen is enabled 2015-11-02 20:15:42 -07:00
Matthew Holt
c3e6463676 A few comments, slight tweaks 2015-11-02 19:27:42 -07:00
Matthew Holt
d18cf12f14 letsencrypt: Fixed renewals 
By chaining in a middleware handler and using newly exposed hooks from the acme package, we're able to proxy ACME requests on port 443 to the ACME client listening on a different port.
 2015-11-02 19:27:23 -07:00
Austin
abc7c6a148 fixed data races in websockets 2015-11-02 14:19:38 -08:00
Matthew Holt
b143bbdbaa letsencrypt: Better logic for handling issuance failures 
This fixes a bug with the -agree flag
 2015-11-02 14:09:35 -07:00
Matthew Holt
be0fb0053d letsencrypt: Re-prompt user if obtaining certs fails due to updated SA 2015-11-02 11:06:42 -07:00
Matthew Holt
2712dcd1f5 tls: If port unspecified and user provides cert+key, use 443 2015-11-01 19:01:46 -07:00
xenolf
cac58eaab9 Update to latest lego changes 2015-11-02 01:41:02 +01:00
Matthew Holt
9a4e26a518 letsencrypt: Don't store KeyFile as field in user; staying consistent 2015-11-01 10:58:58 -07:00
Matthew Holt
a729be295a letsencrypt: Activate during config load just after tls directive 
Before, we were activating Let's Encrypt after all the directives were executed. This means their setup functions had access to potentially erroneous information about the server's TLS setup, since the letsencrypt package makes changes to the port, etc. Now, we execute all directives up to and including tls, then activate letsencrypt, then finish with the rest of the directives. It's a bit ugly, but I do think it is more correct. It also fixes some bugs, for example: a host that only has a catch-all redirect.
 2015-11-01 09:46:23 -07:00
Matt Holt
b6078eded1 Merge pull request #301 from abiosoft/master 
Windows Build: Remove PATH from output.
 2015-10-31 16:50:31 -06:00
Abiola Ibrahim
ea642f6e1d Remove PATH from build output 2015-10-31 23:46:55 +01:00
Matthew Holt
4d71620cb0 core (Windows): Retry every 100ms for 2s if listener fails to bind 
In testing, I've found that Windows doesn't release the socket right away even though the listener is closed, so calling caddy.Start() right after caddy.Stop() can fail. This change has server.ListenAndServe() try up to 20 times every 100ms to bind the listener, and only return an error if it doesn't succeed after 2 seconds. This might be kind of nifty for Unix, too, but there hasn't been a need for it yet.
 2015-10-31 13:22:23 -06:00
Matthew Holt
e4028b23c7 letsencrypt: Email prompt includes link to SA 2015-10-31 13:15:47 -06:00
Matt Holt
96c7c2768c Merge pull request #300 from PatelNDipen/master 
startup/shutdown: test file

Also modified NewTestController to include a value for OncePerServerBlock
 2015-10-31 10:39:41 -06:00
Dipen Patel
78d857a374 debugged startupshutdown.go 2015-10-31 12:33:50 -04:00
Dipen Patel
19148eba44 wrote startupshutdown tests and added OncePerServerBlock value in the NewTestController function of the controller.go file 2015-10-31 10:48:25 -04:00
Abiola Ibrahim
6a32076271 Merge pull request #299 from abiosoft/master 
Fix for issues #297 and #298
 2015-10-31 07:53:17 +01:00
Abiola Ibrahim
ef617f9ce4 Merge pull request #295 from guilhermebr/master 
Add option to change delims in templates
 2015-10-31 07:51:22 +01:00
Matthew Holt
3843cea959 letsencrypt: Allow (but warn about) empty emails 2015-10-30 23:44:00 -06:00
Abiola Ibrahim
dd1c49bde9 Fix for issues #297 and #298 2015-10-31 02:24:37 +01:00
Matthew Holt
e99b3af0a5 letsencrypt: Numerous bug fixes 2015-10-30 15:55:59 -06:00
Matthew Holt
88c646c86c core: Start() blocks until servers finish starting 
Also improved/clarified some docs
 2015-10-30 00:19:43 -06:00
Matthew Holt
64cded8246 letsencrypt: Don't maintain assets of sites we don't maintain 2015-10-29 17:24:11 -06:00
Matthew Holt
e3be524447 core: Fix for graceful reload after first reload signal 
The file path of the originally-loaded Caddyfile must be piped to the forked process; previously it was using stdin after the first fork, which wouldn't load the newest Caddyfile from disk, which is the point of SIGUSR1.
 2015-10-29 17:23:20 -06:00
Guilherme Rezende
a62a7f7cf1 Add new optional block tests to setup/templates_test.go 2015-10-29 20:38:15 -02:00
Guilherme Rezende
9d456bba9b Add argument in new optional block in templates midd to set delimiters 2015-10-29 20:33:01 -02:00
Matthew Holt
89ad7593bd Merge branch 'caddyfile' into letsencrypt 2015-10-29 15:41:34 -06:00
Matthew Holt
d227bec0ff Move common function into existing file 2015-10-29 10:34:47 -06:00
Matt Holt
a3f0fff734 Merge pull request #296 from Makpoc/last-modified 
markdown, templates: Add Last-Modified header
 2015-10-29 10:31:38 -06:00
Matthew Holt
efeeece735 caddyfile: http and https hosts should render in URL format 2015-10-29 10:13:30 -06:00
Matthew Holt
234783548f markdown: Enable tables, fenced code, and strikethrough (closes #294) 2015-10-29 09:59:32 -06:00
makpoc
5a29107f3b Add Last-Modified header when serving markdown and templates 2015-10-29 11:06:35 +02:00
Matthew Holt
976f5182e1 caddyfile: Better string and number handling 2015-10-29 00:22:56 -06:00
Matthew Holt
30c949085c letsencrypt: Stubbed out OCSP staple updates 
OCSP status is checked at a regular interval, and if the OCSP status changes for any of the certificates, the change callback is executed (restarts the server, updating the OCSP staple).
 2015-10-28 23:43:26 -06:00
Matthew Holt
6762df415c Clean up leaking goroutines and safer Start()/Stop() 2015-10-28 22:54:27 -06:00
Matthew Holt
1818b1ea62 letsencrypt: Better error handling, prompt user for SA 2015-10-28 18:12:07 -06:00
xenolf
b67543f81c Track the latest lego OCSP changes 2015-10-28 16:35:19 +01:00
Matt Holt
94ff7dc6fb Merge pull request #287 from Makpoc/parsewincmd 
Fix windows command parsing
 2015-10-27 23:50:21 -06:00
Matthew Holt
cc229aefae templates: Parse host successfully when port is implicit (fixes #292) 2015-10-27 23:20:05 -06:00
Matt Holt
7d91cfb512 Merge pull request #290 from mholt/le-graceful 
Graceful restarts/reloads, refactoring
 2015-10-27 14:17:40 -06:00
Matthew Holt
8548641dc1 letsencrypt: Check for errors 2015-10-27 13:02:47 -06:00
Matthew Holt
c46898592f Merge branch 'letsencrypt' into le-graceful 
Conflicts:
	caddy/letsencrypt/letsencrypt.go
	caddy/letsencrypt/renew.go
 2015-10-27 12:59:55 -06:00
Matthew Holt
362ead2760 Minor test improvements 2015-10-27 12:53:31 -06:00
Matthew Holt
a6ea1e6b55 letsencrypt: -ca flag to customize CA server 2015-10-27 12:52:58 -06:00
Matthew Holt
0f19df8a81 Keep tests deterministic 2015-10-27 00:43:24 -06:00
Matthew Holt
ee5c842c7d Code to convert between JSON and Caddyfile 
This will be used by the API so clients have an easier time manipulating the configuration
 2015-10-27 00:07:22 -06:00
Matthew Holt
c487b702a2 Little cleanup 2015-10-27 00:05:22 -06:00