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
d6a35381
Commit
d6a35381
authored
Jan 10, 2017
by
Matt Holt
Committed by
GitHub
Jan 10, 2017
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #1342 from bengadbois/fix_misspellings
Fix small misspellings
parents
6a84d939
eee9d002
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
4 additions
and
4 deletions
+4
-4
caddy.go
caddy.go
+1
-1
caddyhttp/httpserver/condition.go
caddyhttp/httpserver/condition.go
+1
-1
caddytls/user.go
caddytls/user.go
+1
-1
dist/init/linux-systemd/README.md
dist/init/linux-systemd/README.md
+1
-1
No files found.
caddy.go
View file @
d6a35381
...
@@ -750,7 +750,7 @@ func Upgrade() error {
...
@@ -750,7 +750,7 @@ func Upgrade() error {
}
}
// IsUpgrade returns true if this process is part of an upgrade
// IsUpgrade returns true if this process is part of an upgrade
// where a parent caddy process spawned this one to u
gp
rade
// where a parent caddy process spawned this one to u
pg
rade
// the binary.
// the binary.
func
IsUpgrade
()
bool
{
func
IsUpgrade
()
bool
{
mu
.
Lock
()
mu
.
Lock
()
...
...
caddyhttp/httpserver/condition.go
View file @
d6a35381
...
@@ -198,7 +198,7 @@ func (m IfMatcher) Or(r *http.Request) bool {
...
@@ -198,7 +198,7 @@ func (m IfMatcher) Or(r *http.Request) bool {
// If true, remaining arguments in the dispinser are cleard to keep the dispenser valid for use.
// If true, remaining arguments in the dispinser are cleard to keep the dispenser valid for use.
func
IfMatcherKeyword
(
c
*
caddy
.
Controller
)
bool
{
func
IfMatcherKeyword
(
c
*
caddy
.
Controller
)
bool
{
if
c
.
Val
()
==
"if"
||
c
.
Val
()
==
"if_op"
{
if
c
.
Val
()
==
"if"
||
c
.
Val
()
==
"if_op"
{
// clear remainig args
// clear remaini
n
g args
c
.
RemainingArgs
()
c
.
RemainingArgs
()
return
true
return
true
}
}
...
...
caddytls/user.go
View file @
d6a35381
...
@@ -171,6 +171,6 @@ var stdin = io.ReadWriter(os.Stdin)
...
@@ -171,6 +171,6 @@ var stdin = io.ReadWriter(os.Stdin)
// address was not provided; default 'username' if you will.
// address was not provided; default 'username' if you will.
const
emptyEmail
=
"default"
const
emptyEmail
=
"default"
// TODO: After Boulder implements the 'meta' field of the directoy,
// TODO: After Boulder implements the 'meta' field of the directo
r
y,
// we can get this link dynamically.
// we can get this link dynamically.
const
saURL
=
"https://acme-v01.api.letsencrypt.org/terms"
const
saURL
=
"https://acme-v01.api.letsencrypt.org/terms"
dist/init/linux-systemd/README.md
View file @
d6a35381
...
@@ -78,7 +78,7 @@ sudo chown -R www-data:www-data /var/www/example.com
...
@@ -78,7 +78,7 @@ sudo chown -R www-data:www-data /var/www/example.com
sudo chmod
-R
555 /var/www/example.com
sudo chmod
-R
555 /var/www/example.com
```
```
You'll need to explicity configure caddy to serve the site from this location by adding
You'll need to explicit
l
y configure caddy to serve the site from this location by adding
the following to your Caddyfile if you haven't already:
the following to your Caddyfile if you haven't already:
```
```
...
...
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