Merge pull request #1541 from lucafavatella/review-certs-dir

init: Make CADDYPATH equal across init scripts

dist/init/linux-sysvinit/README.md

@@ -6,6 +6,6 @@ Usage
 
 * 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`.
-* 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`
 * Now you can use `service caddy start|stop|restart|reload|status` as `root`.

dist/init/linux-sysvinit/caddy

@@ -28,7 +28,7 @@ STOP_SCHEDULE="${STOP_SCHEDULE:-QUIT/5/TERM/5/KILL/5}"
 test -x $DAEMON || exit 0
 
 # 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
 ulimit -n 8192

dist/init/linux-upstart/caddy.conf

@@ -14,12 +14,12 @@ respawn limit 10 5
 reload signal SIGUSR1
 
 # Let's Encrypt certificates will be written to this directory.
-env CADDYPATH=/etc/caddy
+env CADDYPATH=/etc/ssl/caddy
 
 limit nofile 1048576 1048576
 
 script
-        cd /etc/caddy
+        cd /etc/ssl/caddy
         rootdir="$(mktemp -d -t "caddy-run.XXXXXX")"
         exec /usr/local/bin/caddy -agree -log=stdout -conf=/etc/caddy/Caddyfile -root=$rootdir
 end script

dist/init/linux-upstart/caddy.conf.centos-6

@@ -17,12 +17,12 @@ respawn limit 10 5
 reload signal SIGUSR1
 
 # Let's Encrypt certificates will be written to this directory.
-env CADDYPATH=/etc/caddy
+env CADDYPATH=/etc/ssl/caddy
 
 limit nofile 1048576 1048576
 
 script
-        cd /etc/caddy
+        cd /etc/ssl/caddy
         rootdir="$(mktemp -d -t "caddy-run.XXXXXX")"
         exec /usr/local/bin/caddy -agree -log=stdout -conf=/etc/caddy/Caddyfile -root=$rootdir
 end script

dist/init/linux-upstart/caddy.conf.ubuntu-12.04

@@ -15,12 +15,12 @@ respawn limit 10 5
 #reload signal SIGUSR1
 
 # Let's Encrypt certificates will be written to this directory.
-env CADDYPATH=/etc/caddy
+env CADDYPATH=/etc/ssl/caddy
 
 limit nofile 1048576 1048576
 
 script
-        cd /etc/caddy
+        cd /etc/ssl/caddy
         rootdir="$(mktemp -d -t "caddy-run.XXXXXX")"
         exec /usr/local/bin/caddy -agree -log=stdout -conf=/etc/caddy/Caddyfile -root=$rootdir
 end script