From 7ad91e0f6c991c72a9f41b468638fd5233a77c33 Mon Sep 17 00:00:00 2001 From: Mine Coins Date: Sun, 19 Feb 2017 14:32:45 +0200 Subject: [PATCH] deploy: slightly cleaner caddy installation --- deployment/deploy.bash | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/deployment/deploy.bash b/deployment/deploy.bash index 47c114e..cf43c5a 100644 --- a/deployment/deploy.bash +++ b/deployment/deploy.bash @@ -57,10 +57,10 @@ npm install ./node_modules/gulp/bin/gulp.js build cd build sudo ln -s `pwd` /var/www -cd /tmp/ -wget -O caddy.tar.gz 'https://caddyserver.com/download/build?os=linux&arch=amd64&features=cors' -tar -xf caddy.tar.gz -sudo cp caddy /usr/local/bin +CADDY_DOWNLOAD_DIR=$(mktemp -d) +cd $CADDY_DOWNLOAD_DIR +curl -sL "https://caddyserver.com/download/build?os=linux&arch=amd64&features=cors" | tar -xz caddy init/linux-systemd/caddy.service +sudo mv caddy /usr/local/bin sudo chown root:root /usr/local/bin/caddy sudo chmod 755 /usr/local/bin/caddy sudo setcap 'cap_net_bind_service=+ep' /usr/local/bin/caddy @@ -74,13 +74,13 @@ sudo chmod 0770 /etc/ssl/caddy sudo cp ~/nodejs-pool/deployment/caddyfile /etc/caddy/Caddyfile sudo chown www-data:www-data /etc/caddy/Caddyfile sudo chmod 444 /etc/caddy/Caddyfile -sudo cp /tmp/init/linux-systemd/caddy.service /etc/systemd/system/ +sudo sh -c "sed 's/ProtectHome=true/ProtectHome=false/' init/linux-systemd/caddy.service > /etc/systemd/system/caddy.service" sudo chown root:root /etc/systemd/system/caddy.service sudo chmod 744 /etc/systemd/system/caddy.service -sudo sed -i 's/ProtectHome=true/ProtectHome=false/' /etc/systemd/system/caddy.service sudo systemctl daemon-reload sudo systemctl enable caddy.service sudo systemctl start caddy.service +rm -rf $CADDY_DOWNLOAD_DIR cd ~ sudo env PATH=$PATH:`pwd`/.nvm/versions/node/v6.9.2/bin `pwd`/.nvm/versions/node/v6.9.2/lib/node_modules/pm2/bin/pm2 startup systemd -u $CURUSER --hp `pwd` cd ~/nodejs-pool