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
956266cd
Commit
956266cd
authored
Mar 28, 2017
by
Luca Favatella
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Make CADDYPATH equal across init scripts
See also
https://github.com/mholt/caddy/pull/1272#issue-191256343
parent
6cabc9bf
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
8 additions
and
8 deletions
+8
-8
dist/init/linux-sysvinit/README.md
dist/init/linux-sysvinit/README.md
+1
-1
dist/init/linux-sysvinit/caddy
dist/init/linux-sysvinit/caddy
+1
-1
dist/init/linux-upstart/caddy.conf
dist/init/linux-upstart/caddy.conf
+2
-2
dist/init/linux-upstart/caddy.conf.centos-6
dist/init/linux-upstart/caddy.conf.centos-6
+2
-2
dist/init/linux-upstart/caddy.conf.ubuntu-12.04
dist/init/linux-upstart/caddy.conf.ubuntu-12.04
+2
-2
No files found.
dist/init/linux-sysvinit/README.md
View file @
956266cd
...
@@ -6,6 +6,6 @@ Usage
...
@@ -6,6 +6,6 @@ Usage
*
Download the appropriate Caddy binary in
`/usr/local/bin/caddy`
or use
`curl https://getcaddy.com | bash`
.
*
Download the appropriate Caddy binary in
`/usr/local/bin/caddy`
or use
`curl https://getcaddy.com | bash`
.
*
Save the SysVinit config file in
`/etc/init.d/caddy`
.
*
Save the SysVinit config file in
`/etc/init.d/caddy`
.
*
Ensure that the folder
`/etc/caddy`
exists and that the
subfolder
`ssl
`
is owned by
`www-data`
.
*
Ensure that the folder
`/etc/caddy`
exists and that the
folder
`/etc/ssl/caddy
`
is owned by
`www-data`
.
*
Create a Caddyfile in
`/etc/caddy/Caddyfile`
*
Create a Caddyfile in
`/etc/caddy/Caddyfile`
*
Now you can use
`service caddy start|stop|restart|reload|status`
as
`root`
.
*
Now you can use
`service caddy start|stop|restart|reload|status`
as
`root`
.
dist/init/linux-sysvinit/caddy
View file @
956266cd
...
@@ -28,7 +28,7 @@ STOP_SCHEDULE="${STOP_SCHEDULE:-QUIT/5/TERM/5/KILL/5}"
...
@@ -28,7 +28,7 @@ STOP_SCHEDULE="${STOP_SCHEDULE:-QUIT/5/TERM/5/KILL/5}"
test
-x
$DAEMON
||
exit
0
test
-x
$DAEMON
||
exit
0
# Set the CADDYPATH; Let's Encrypt certificates will be written to this directory.
# Set the CADDYPATH; Let's Encrypt certificates will be written to this directory.
export
CADDYPATH
=
/etc/
caddy/ssl
export
CADDYPATH
=
/etc/
ssl/caddy
# Set the ulimits
# Set the ulimits
ulimit
-n
8192
ulimit
-n
8192
...
...
dist/init/linux-upstart/caddy.conf
View file @
956266cd
...
@@ -14,12 +14,12 @@ respawn limit 10 5
...
@@ -14,12 +14,12 @@ respawn limit 10 5
reload
signal
SIGUSR1
reload
signal
SIGUSR1
# Let's Encrypt certificates will be written to this directory.
# Let's Encrypt certificates will be written to this directory.
env
CADDYPATH
=/
etc
/
caddy
env
CADDYPATH
=/
etc
/
ssl
/
caddy
limit
nofile
1048576
1048576
limit
nofile
1048576
1048576
script
script
cd
/
etc
/
caddy
cd
/
etc
/
ssl
/
caddy
rootdir
=
"$(mktemp -d -t "
caddy
-
run
.
XXXXXX
")"
rootdir
=
"$(mktemp -d -t "
caddy
-
run
.
XXXXXX
")"
exec
/
usr
/
local
/
bin
/
caddy
-
agree
-
log
=
stdout
-
conf
=/
etc
/
caddy
/
Caddyfile
-
root
=$
rootdir
exec
/
usr
/
local
/
bin
/
caddy
-
agree
-
log
=
stdout
-
conf
=/
etc
/
caddy
/
Caddyfile
-
root
=$
rootdir
end
script
end
script
dist/init/linux-upstart/caddy.conf.centos-6
View file @
956266cd
...
@@ -17,12 +17,12 @@ respawn limit 10 5
...
@@ -17,12 +17,12 @@ respawn limit 10 5
reload signal SIGUSR1
reload signal SIGUSR1
# Let's Encrypt certificates will be written to this directory.
# Let's Encrypt certificates will be written to this directory.
env CADDYPATH=/etc/caddy
env CADDYPATH=/etc/
ssl/
caddy
limit nofile 1048576 1048576
limit nofile 1048576 1048576
script
script
cd /etc/caddy
cd /etc/
ssl/
caddy
rootdir="$(mktemp -d -t "caddy-run.XXXXXX")"
rootdir="$(mktemp -d -t "caddy-run.XXXXXX")"
exec /usr/local/bin/caddy -agree -log=stdout -conf=/etc/caddy/Caddyfile -root=$rootdir
exec /usr/local/bin/caddy -agree -log=stdout -conf=/etc/caddy/Caddyfile -root=$rootdir
end script
end script
dist/init/linux-upstart/caddy.conf.ubuntu-12.04
View file @
956266cd
...
@@ -15,12 +15,12 @@ respawn limit 10 5
...
@@ -15,12 +15,12 @@ respawn limit 10 5
#reload signal SIGUSR1
#reload signal SIGUSR1
# Let's Encrypt certificates will be written to this directory.
# Let's Encrypt certificates will be written to this directory.
env CADDYPATH=/etc/caddy
env CADDYPATH=/etc/
ssl/
caddy
limit nofile 1048576 1048576
limit nofile 1048576 1048576
script
script
cd /etc/caddy
cd /etc/
ssl/
caddy
rootdir="$(mktemp -d -t "caddy-run.XXXXXX")"
rootdir="$(mktemp -d -t "caddy-run.XXXXXX")"
exec /usr/local/bin/caddy -agree -log=stdout -conf=/etc/caddy/Caddyfile -root=$rootdir
exec /usr/local/bin/caddy -agree -log=stdout -conf=/etc/caddy/Caddyfile -root=$rootdir
end script
end script
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