github-mirror/caddy
2
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2024-11-22 11:33:06 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
1,669 Commits 30 Branches 138 Tags 33 MiB
38cb587e0f
Commit Graph

162 Commits

Author SHA1 Message Date
Matthew Holt
38cb587e0f
cmd: Avoid spammy log messages (fix #5538) 
I forgot there are two calls to LoadConfig() here that needed replacing.
 2023-05-17 16:13:15 -06:00
Matthew Holt
5ebb7d496d
cmd: Reduce spammy logs from --watch 2023-05-12 11:04:02 -06:00
Yehonatan Ezron
571fc034d3
feature: watch include directory (#5521) 
Co-authored-by: Matt Holt <mholt@users.noreply.github.com>
 2023-05-08 22:49:16 +00:00
Matt Holt
205b142614
cmd: Support ' quotes in envfile parsing (#5437) 2023-04-10 13:55:45 -06:00
Matthew Holt
508cf2aa22
cmd: Create pidfile before config load (close #5477) 2023-04-03 11:57:16 -06:00
Francis Lavoie
9e6919550b
cmd: Expand cobra support, add short flags (#5379) 
* cmd: Expand cobra support

* Convert commands to cobra, add short flags

* Fix version command typo

Co-authored-by: Emily Lange <git@indeednotjames.com>

* Apply suggestions from code review

Co-authored-by: Matt Holt <mholt@users.noreply.github.com>

---------

Co-authored-by: Emily Lange <git@indeednotjames.com>
Co-authored-by: Matt Holt <mholt@users.noreply.github.com>
 2023-02-24 16:09:12 -07:00
Francis Lavoie
79de6df93d
cmd: Strict unmarshal for validate (#5383) 2023-02-22 11:39:40 -07:00
Emily Lange
bf54892a73
cmd: make caddy fmt hints more clear (#5378) 2023-02-16 16:34:12 -07:00
Francis Lavoie
5ded580444
cmd: Adjust documentation for commands (#5377) 2023-02-16 09:14:07 -07:00
Amis Shokoohi
94b8d56096
cmd: Add --envfile flag to validate command (#5350) 
Fixes https://github.com/caddyserver/caddy/issues/5346
 2023-01-31 16:27:35 -05:00
Amis Shokoohi
8c0b49bf03
cmd: fmt exit successfully after overwriting config file (#5351) 
Fixes https://github.com/caddyserver/caddy/issues/5349
 2023-01-31 11:24:44 -05:00
Y.Horie
5805b3ca11
cmd: caddy fmt return code is 1 if not formatted (#5297) 
* cmd: Fix caddy fmt if input isn't formatted

* Fixes #5294
* return exit 1 with an error message

* cmd: Use formattingDifference for caddy fmt

* #5294
* expose caddyfile.formattingDifference
 2023-01-21 21:28:37 -07:00
Y.Horie
8d6870fd06
chore: Fix typo, coral -> cobra (#5325) 2023-01-21 10:27:58 -05:00
Francis Lavoie
ee7c92ec9b
reverseproxy: Mask the WS close message when we're the client (#5199) 
* reverseproxy: Mask the WS close message when we're the client

* weakrand

* Bump golangci-lint version so path ignores work on Windows

* gofmt

* ugh, gofmt everything, I guess
 2022-11-14 09:38:02 -07:00
Mohammed Al Sahaf
f20a8e7aa0
cmd: replace deprecate func use (#5170) 2022-10-25 17:56:38 +03:00
BakaFT
a999b70727
cmd: Add missing \n to HelpTemplate (#5151) 2022-10-17 11:51:41 +03:00
Matthew Holt
62b0685375
cmd: Improve error message if config missing 2022-09-14 23:24:16 -06:00
Matthew Holt
0b3161aeea
cmd: Customizable user agent (close #2795) 2022-09-13 17:21:04 -06:00
Matthew Holt
1c9c8f6a13
cmd: Enhance some help text 2022-09-06 14:19:58 -06:00
Matthew Holt
ec2a5762b0 cmd: Don't print long help text on error 2022-09-01 21:43:23 -06:00
Matthew Holt
687a4b9e81
cmd: Enhance CLI docs 2022-08-30 19:15:52 -06:00
Mohammed Al Sahaf
d605ebe75a
cmd: add completion command (#4994) 
* cmd: add completion command

* error check
 2022-08-30 23:24:05 +00:00
Mohammed Al Sahaf
258bc82b69
cmd: Migrate to spf13/cobra, remove single-dash arg support (#4565) 
* cmd: migrate to spf13/cobra

* add `manpage` command

* limit Caddy tagline to root `help` only

* hard-code the manpage section to 8
 2022-08-30 22:38:38 +00:00
Chirag Maheshwari
d26559316f
Replace strings.Index with strings.Cut (#4932) 2022-08-06 22:03:37 -06:00
WilczyńskiT
2642bd72b7
Replace strings.Index usages with strings.Cut (#4930) 2022-08-04 11:17:35 -06:00
Matt Holt
17ae5acaba
cmd: Use newly-available version information (#4931) 2022-08-04 11:16:59 -06:00
Francis Lavoie
141872ed80
chore: Bump up to Go 1.19, minimum 1.18 (#4925) 2022-08-02 16:39:09 -04:00
Matthew Holt
db1aa5b5bc
Oops (sigh) 
Forgot to remove this redundant line
 2022-08-01 13:40:09 -06:00
Matt Holt
f783290f40
caddyhttp: Implement caddy respond command (#4870) 2022-08-01 13:36:22 -06:00
Matthew Holt
07ed3e7c30
Minor docs clarification 
Related to #4565
 2022-07-29 16:56:02 -06:00
WingLim
1e0cdc54f8
core: Windows service integration (#4790) 
Co-authored-by: Matthew Holt <mholt@users.noreply.github.com>
 2022-07-29 14:06:54 -06:00
Matthew Holt
56c139f003
Fix compilation on Windows 2022-07-28 15:44:36 -06:00
Matthew Holt
2e70d1d3bf
Fix deprecation notice by using UTF16PtrFromString 2022-07-28 15:24:08 -06:00
Francis Lavoie
abad9bc256
cmd: Fix reload with stdin (#4900) 2022-07-20 18:14:33 -06:00
Matthew Holt
050d6e0aeb
Add comment about xcaddy to main 2022-06-15 15:20:59 -06:00
Francis Lavoie
2e4c09155a
cmd: Fix unix socket addresses for admin API requests (#4742) 
Fixes a regression in c2327161f7
 2022-04-28 08:31:59 -06:00
Francis Lavoie
3a1e0dbf47
httpcaddyfile: Deprecate paths in site addresses; use zap logs (#4728) 2022-04-25 10:12:10 -06:00
Matthew Holt
30b6d1f47a
cmd: Enhance .env (dotenv) file parsing 
Basic support for quoted values, newlines in quoted values, and comments.

Does not support variable or command expansion.
 2022-04-13 11:38:20 -06:00
Francis Lavoie
6512832f9f
cmd: Add --diff option for caddy fmt (#4695) 2022-04-12 14:49:19 -04:00
Francis Lavoie
22d8edb984
cmd: Fix defaulting admin address if empty in config, fixes reload (#4674) 2022-04-03 12:04:33 -04:00
Matthew Holt
c2327161f7
cmd: Set Origin header properly on API requests 
Ref. https://caddy.community/t/bug-in-enforce-origin/15417
 2022-03-19 22:51:32 -06:00
Francis Lavoie
bbad6931e3
pki: Implement API endpoints for certs and caddy trust (#4443) 
* admin: Implement /pki/certificates/<id> API

* pki: Lower "skip_install_trust" log level to INFO

See https://github.com/caddyserver/caddy/issues/4058#issuecomment-976132935

It's not necessary to warn about this, because this was an option explicitly configured by the user. Still useful to log, but we don't need to be so loud about it.

* cmd: Export functions needed for PKI app, return API response to caller

* pki: Rewrite `caddy trust` command to use new admin endpoint instead

* pki: Rewrite `caddy untrust` command to support using admin endpoint

* Refactor cmd and pki packages for determining admin API endpoint
 2022-03-02 11:08:36 -07:00
Matthew Holt
1a7a78a1f2
cmd: Print error if fmt overwrite fails (fix #4524) 2022-01-16 17:30:14 -07:00
Francis Lavoie
749e55c738
caddycmd: Add --keep-backup to upgrade commands (#4387) 
* caddycmd: Add `--skip-cleanup` to upgrade commands

This is a partial fix for https://github.com/caddyserver/caddy/issues/4057, making it possible to retain the old build of Caddy, in case something went wrong.

* caddycmd: Fix duplicate error message

The error message "download succeeded, but unable to execute" was repeated, because it was both in the `listModules`/`showVersion` functions and in the calling `upgradeBuild` function. Oversight when this was refactored.

* caddycmd: Implement fix for performing cleanup on Windows

Without this, the cleanup operation would fail with an error message like this:

upgrade: download succeeded, but unable to clean up backup binary: remove C:\caddy\caddy.exe.tmp: Access is denied.

* caddycmd: Rename to `--keep-backup`, simplify build constraints
 2021-11-08 11:35:46 -07:00
Francis Lavoie
062657d0d8
caddycmd: Add --skip-standard to list-modules command, quieter output (#4386) 
* caddycmd: Add --skip-standard to list-modules command, quieter output

* caddycmd: Also quiet `caddy upgrade` output, redundant information
 2021-10-18 12:19:04 -06:00
M. Ángel Jimeno
be5f77e84d
caddycmd: fix caddy validate/fmt help message (#4377) 
* caddycmd: fix caddy validate help message

Fixes #4376

* caddycmd: fix caddy fmt help message
 2021-10-11 11:56:03 -04:00
KallyDev
c48fadc4a7
Move from deprecated ioutil to os and io packages (#4364) 2021-09-29 11:17:48 -06:00
peymaneh
9f6393c64c
cmd: export CaddyVersion(), Commands() (#4316) 
* cmd: Export CaddyVersion()

* cmd: Add getter Commands()
 2021-09-01 18:08:02 -06:00
Pascal Zarrad
ce5a45db45
cmd: Fix paths when using an env file (#4296) 
* core: Fix paths when using an env file

* refactor: move path logic to loadFromEnv
 2021-08-20 15:51:31 -06:00
M. Ángel Jimeno
9e333c39da
cmd: use net.ErrClosed for matching returned error (#4289) 
Implements #3805
 2021-08-18 12:58:19 -06:00