github-mirror/caddy
2
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2024-11-29 04:10:16 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Changing refs from /usr/bin to /usr/local/bin

Browse Source
This commit is contained in:
Ian Walter 2016-07-05 13:39:04 -04:00
parent fdb6d64f9d
commit ad2ed5b0ae
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dist/init/linux-systemd/README.md vendored
View File

@ -49,7 +49,7 @@ chmod 0770 /etc/ssl/caddy
[Service] [Service]
; an empty value clears the original (and preceding) settings ; an empty value clears the original (and preceding) settings
ExecStart= ExecStart=
ExecStart=/usr/bin/caddy -conf="/etc/caddy/myCaddy.conf" ExecStart=/usr/local/bin/caddy -conf="/etc/caddy/myCaddy.conf"
``` ```
- To view the resulting configuration use `systemctl cat caddy` - To view the resulting configuration use `systemctl cat caddy`

2
dist/init/linux-systemd/caddy.service vendored
View File

@ -15,7 +15,7 @@ Group=www-data
Environment=HOME=/etc/ssl/caddy Environment=HOME=/etc/ssl/caddy
; Always set "-root" to something safe in case it gets forgotten in the Caddyfile. ; Always set "-root" to something safe in case it gets forgotten in the Caddyfile.
ExecStart=/usr/bin/caddy -log stdout -agree=true -conf=/etc/caddy/Caddyfile -root=/var/tmp ExecStart=/usr/local/bin/caddy -log stdout -agree=true -conf=/etc/caddy/Caddyfile -root=/var/tmp
ExecReload=/bin/kill -USR1 $MAINPID ExecReload=/bin/kill -USR1 $MAINPID
; Limit the number of file descriptors; see `man systemd.exec` for more limit settings. ; Limit the number of file descriptors; see `man systemd.exec` for more limit settings.

2
dist/init/linux-upstart/README.md vendored
View File

@ -7,7 +7,7 @@ Usage
Usage in this blogpost: [Running Caddy Server as a service with Upstart](https://denbeke.be/blog/servers/running-caddy-server-as-a-service/). Usage in this blogpost: [Running Caddy Server as a service with Upstart](https://denbeke.be/blog/servers/running-caddy-server-as-a-service/).
Short recap: Short recap:
* Download Caddy in `/usr/bin/caddy` and execute `sudo setcap cap_net_bind_service=+ep /usr/bin/caddy`. * Download Caddy in `/usr/local/bin/caddy` and execute `sudo setcap cap_net_bind_service=+ep /usr/local/bin/caddy`.
* Save the upstart config file in `/etc/init/caddy.conf`. * Save the upstart config file in `/etc/init/caddy.conf`.
* Ensure that the folder `/etc/caddy` exists and that the subfolder .caddy is owned by `www-data`. * Ensure that the folder `/etc/caddy` exists and that the subfolder .caddy is owned by `www-data`.
* Create a Caddyfile in `/etc/caddy/Caddyfile`. * Create a Caddyfile in `/etc/caddy/Caddyfile`.

2
dist/init/linux-upstart/caddy.conf vendored
View File

@ -19,5 +19,5 @@ limit nofile 1048576 1048576
script script
cd /etc/caddy cd /etc/caddy
rootdir="$(mktemp -d -t "caddy-run.XXXXXX")" rootdir="$(mktemp -d -t "caddy-run.XXXXXX")"
exec /usr/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