From 7dc23b18aeef7cd3d6f3c13b485a9159767be67a Mon Sep 17 00:00:00 2001 From: Geno Date: Wed, 23 Nov 2016 22:12:19 +0100 Subject: [PATCH] Init switch from HOME to Caddy (#1272) * INIT-systemd use CADDYPATH instatt of HOME * INIT-upstart use CADDYPATH instatt of HOME * INIT-upstart use CADDYPATH instatt of HOME * INIT-upstart use CADDYPATH instatt of HOME --- dist/init/linux-systemd/caddy.service | 2 +- dist/init/linux-upstart/caddy.conf | 2 +- dist/init/linux-upstart/caddy.conf.centos-6 | 2 +- dist/init/linux-upstart/caddy.conf.ubuntu-12.04 | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dist/init/linux-systemd/caddy.service b/dist/init/linux-systemd/caddy.service index 536cb3a19..d9786e880 100644 --- a/dist/init/linux-systemd/caddy.service +++ b/dist/init/linux-systemd/caddy.service @@ -12,7 +12,7 @@ User=www-data Group=www-data ; Letsencrypt-issued certificates will be written to this directory. -Environment=HOME=/etc/ssl/caddy +Environment=CADDYPATH=/etc/ssl/caddy ; Always set "-root" to something safe in case it gets forgotten in the Caddyfile. ExecStart=/usr/local/bin/caddy -log stdout -agree=true -conf=/etc/caddy/Caddyfile -root=/var/tmp diff --git a/dist/init/linux-upstart/caddy.conf b/dist/init/linux-upstart/caddy.conf index 36c84bad0..2b3e7c155 100644 --- a/dist/init/linux-upstart/caddy.conf +++ b/dist/init/linux-upstart/caddy.conf @@ -14,7 +14,7 @@ respawn limit 10 5 reload signal SIGUSR1 # Let's Encrypt certificates will be written to this directory. -env HOME=/etc/caddy +env CADDYPATH =/etc/caddy limit nofile 1048576 1048576 diff --git a/dist/init/linux-upstart/caddy.conf.centos-6 b/dist/init/linux-upstart/caddy.conf.centos-6 index 434ab9484..cb628f4e3 100644 --- a/dist/init/linux-upstart/caddy.conf.centos-6 +++ b/dist/init/linux-upstart/caddy.conf.centos-6 @@ -17,7 +17,7 @@ respawn limit 10 5 reload signal SIGUSR1 # Let's Encrypt certificates will be written to this directory. -env HOME=/etc/caddy +env CADDYPATH=/etc/caddy limit nofile 1048576 1048576 diff --git a/dist/init/linux-upstart/caddy.conf.ubuntu-12.04 b/dist/init/linux-upstart/caddy.conf.ubuntu-12.04 index c32020ec1..712ed5132 100644 --- a/dist/init/linux-upstart/caddy.conf.ubuntu-12.04 +++ b/dist/init/linux-upstart/caddy.conf.ubuntu-12.04 @@ -15,7 +15,7 @@ respawn limit 10 5 #reload signal SIGUSR1 # Let's Encrypt certificates will be written to this directory. -env HOME=/etc/caddy +env CADDYPATH=/etc/caddy limit nofile 1048576 1048576