Matthew Holt
ed0c0db6a3
If scheme and port defy convention, it is an error
...
This prevents serving HTTPS over port 80 or HTTP over 443. It's confusing and we don't allow it.
2016-01-10 20:51:50 -07:00
Matthew Holt
dab679df86
import: Fix multiple imports ( closes #480 )
2016-01-09 10:52:21 -07:00
Matthew Holt
94100a7ba6
Fix failing tests
2016-01-04 17:34:10 -07:00
Matthew Holt
e9c2e50684
Merge branch 'master' into letsencryptfix
...
# Conflicts:
# caddy/letsencrypt/letsencrypt.go
2016-01-03 23:56:22 -07:00
Matthew Holt
946ff5e87b
Parser separate scheme/port, refactor config loading
...
By separating scheme and port at the parser, we are able to set the port appropriately and also keep the semantics of the scheme being specified by the user later on. The parser also stores an address' original input. Also, the config refactor makes it possible to partially load a config - valuable for determining which ones will need Let's Encrypt integration turned on during a restart.
2016-01-03 16:41:29 -07:00
Radim Marek
1e7ec3397b
Import allows only one expression
2015-12-29 23:32:59 +01:00
Radim Marek
eb48885d4d
Updated comments
2015-12-11 22:02:31 +01:00
Radim Marek
afbda595f6
import glob tests
2015-12-11 21:52:35 +01:00
Radim Marek
d56a9a1c5d
Correct position of the newly imported tokens
2015-12-06 23:50:26 +01:00
Radim Marek
d1216f409d
Handle no matches
2015-12-04 23:22:03 +01:00
Radim Marek
12f594779c
Added support magic characters in import pattern
...
Import now allows to use the star wildcard, question mark and square
brackets as used by filepath.Glob
2015-12-04 23:04:12 +01:00
Matthew Holt
1ca34c4ecf
Couple fixes for env var replacements and tests
2015-11-15 08:01:24 -07:00
Matt Holt
837ee9f042
Merge pull request #319 from mbanzon/issue-304
...
parser: Allow use of environment variables in tokens
2015-11-15 07:17:42 -07:00
Michael Banzon
d448c919e8
Changed implementation of issue #304 fix
...
It no longer uses regular expressions.
It supports both the Unix `{$ENV_VAR}` _and_ the Windows `{%ENV_VAR%}`
syntax.
Added test for both Unix and Windows env. syntax.
2015-11-15 11:16:37 +01:00
Michael Banzon
e166ebf68b
Added test for environment replacement.
...
Added test for the fix of issue #304
2015-11-14 18:54:29 +01:00
Matthew Holt
d34e92ee70
checkDirectives must've slipped through the cracks in big merge
...
Also we're not messing with log flags anymore during parsing. Timestamps could come in handy, plus concurrent logging is going on now.
2015-11-05 17:14:47 -07:00
Michael Banzon
8774c90709
Removed the Windows part. It wasn't working properly.
...
For issue #304 .
2015-11-05 18:12:06 +01:00
Michael Banzon
01465932e7
Environment variables Windows style
...
Added the Windows style ({%%}) for environment variables in Caddyfiles
(for issue #304 ).
2015-11-05 18:01:44 +01:00
Michael Banzon
72c0527b7d
Added support for env vars in Caddyfile
...
This is work in progress for #304
2015-11-05 08:26:10 +01:00
buddhamagnet
e23af5e99a
final corrections
2015-11-05 00:44:35 +00:00
buddhamagnet
57f1d3c205
pass golint
...
pass all tests
respond to maintainer comments
reinstate assignment of t
correct typo
correct typo
pass linter some more
2015-11-05 00:40:35 +00: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
4ebff9a130
core: Major refactor for graceful restarts; numerous fixes
...
Merged config and app packages into one called caddy. Abstracted away caddy startup functionality making it easier to embed Caddy in any Go application and use it as a library. Graceful restart (should) now ensure child starts properly. Now piping a gob bundle to child process so that the child can match up inherited listeners to server address. Much cleanup still to do.
2015-10-26 13:34:31 -06:00
