From 956266cd792cdeac42d7f1cbb5ec807a46284d60 Mon Sep 17 00:00:00 2001
From: Luca Favatella <luca.favatella@erlang-solutions.com>
Date: Tue, 28 Mar 2017 21:56:18 +0100
Subject: [PATCH] Make CADDYPATH equal across init scripts
See also https://github.com/mholt/caddy/pull/1272#issue-191256343
---
dist/init/linux-sysvinit/README.md | 2 +-
dist/init/linux-sysvinit/caddy | 2 +-
dist/init/linux-upstart/caddy.conf | 4 ++--
dist/init/linux-upstart/caddy.conf.centos-6 | 4 ++--
dist/init/linux-upstart/caddy.conf.ubuntu-12.04 | 4 ++--
5 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/dist/init/linux-sysvinit/README.md b/dist/init/linux-sysvinit/README.md
index 02d86dc5d..f5ce4de09 100644
--- a/dist/init/linux-sysvinit/README.md
+++ b/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`.
diff --git a/dist/init/linux-sysvinit/caddy b/dist/init/linux-sysvinit/caddy
index e723fe171..8ec386e89 100644
--- a/dist/init/linux-sysvinit/caddy
+++ b/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
diff --git a/dist/init/linux-upstart/caddy.conf b/dist/init/linux-upstart/caddy.conf
index 038495dc9..0beef21ed 100644
--- a/dist/init/linux-upstart/caddy.conf
+++ b/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
diff --git a/dist/init/linux-upstart/caddy.conf.centos-6 b/dist/init/linux-upstart/caddy.conf.centos-6
index cb628f4e3..e254ffe69 100644
--- a/dist/init/linux-upstart/caddy.conf.centos-6
+++ b/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
diff --git a/dist/init/linux-upstart/caddy.conf.ubuntu-12.04 b/dist/init/linux-upstart/caddy.conf.ubuntu-12.04
index 712ed5132..321bec0ca 100644
--- a/dist/init/linux-upstart/caddy.conf.ubuntu-12.04
+++ b/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