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
nexedi
caddy
Commits
fc10951d
Commit
fc10951d
authored
Mar 13, 2016
by
Matt Holt
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #676 from abiosoft/list-directives
Add flag to list directives.
parents
3e48e6a5
44fc9b18
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
22 additions
and
5 deletions
+22
-5
caddy/directives.go
caddy/directives.go
+9
-0
main.go
main.go
+13
-5
No files found.
caddy/directives.go
View file @
fc10951d
...
...
@@ -69,6 +69,15 @@ var directiveOrder = []directive{
{
"browse"
,
setup
.
Browse
},
}
// Directives returns the list of directives in order of priority.
func
Directives
()
[]
string
{
directives
:=
make
([]
string
,
len
(
directiveOrder
))
for
i
,
d
:=
range
directiveOrder
{
directives
[
i
]
=
d
.
name
}
return
directives
}
// RegisterDirective adds the given directive to caddy's list of directives.
// Pass the name of a directive you want it to be placed after,
// otherwise it will be placed at the bottom of the stack.
...
...
main.go
View file @
fc10951d
...
...
@@ -36,6 +36,7 @@ func init() {
flag
.
StringVar
(
&
revoke
,
"revoke"
,
""
,
"Hostname for which to revoke the certificate"
)
flag
.
StringVar
(
&
caddy
.
Root
,
"root"
,
caddy
.
DefaultRoot
,
"Root path to default site"
)
flag
.
BoolVar
(
&
version
,
"version"
,
false
,
"Show version"
)
flag
.
BoolVar
(
&
directives
,
"directives"
,
false
,
"List supported directives"
)
}
func
main
()
{
...
...
@@ -77,6 +78,12 @@ func main() {
}
os
.
Exit
(
0
)
}
if
directives
{
for
_
,
d
:=
range
caddy
.
Directives
()
{
fmt
.
Println
(
d
)
}
os
.
Exit
(
0
)
}
// Set CPU cap
err
:=
setCPU
(
cpu
)
...
...
@@ -217,6 +224,7 @@ var (
logfile
string
revoke
string
version
bool
directives
bool
)
// Build information obtained with the help of -ldflags
...
...
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