Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
caddy
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Łukasz Nowak
caddy
Commits
e56f7aff
Commit
e56f7aff
authored
Nov 07, 2015
by
Matthew Holt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Show message when activating HTTPS
It can take a few seconds...
parent
18e9aa4d
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
5 deletions
+9
-5
caddy/config.go
caddy/config.go
+9
-0
caddy/letsencrypt/letsencrypt.go
caddy/letsencrypt/letsencrypt.go
+0
-5
No files found.
caddy/config.go
View file @
e56f7aff
...
...
@@ -114,10 +114,19 @@ func loadConfigs(filename string, input io.Reader) ([]server.Config, error) {
// the rest of the middlewares so they have correct information regarding
// TLS configuration, if necessary. (this call is append-only, so our
// iterations below shouldn't be affected)
if
!
IsRestart
()
&&
!
Quiet
{
fmt
.
Print
(
"Activating privacy features..."
)
}
configs
,
err
=
letsencrypt
.
Activate
(
configs
)
if
err
!=
nil
{
if
!
Quiet
{
fmt
.
Println
()
}
return
nil
,
err
}
if
!
IsRestart
()
&&
!
Quiet
{
fmt
.
Println
(
" done."
)
}
// Finish setting up the rest of the directives, now that TLS is
// optimally configured. These loops are similar to above except
...
...
caddy/letsencrypt/letsencrypt.go
View file @
e56f7aff
...
...
@@ -46,11 +46,6 @@ func Activate(configs []server.Config) ([]server.Config, error) {
// just in case previous caller forgot...
Deactivate
()
// TODO: All the output the end user should see when running caddy is something
// simple like "Setting up HTTPS..." (and maybe 'done' at the end of the line when finished).
// In other words, hide all the other logging except for on errors. Or maybe
// have a place to put those logs.
// reset cached ocsp statuses from any previous activations
ocspStatus
=
make
(
map
[
*
[]
byte
]
int
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment