From e0ea30c3fe408dc8764d8ac273feebe8080a3b36 Mon Sep 17 00:00:00 2001 From: Damien Tardy-Panis Date: Wed, 3 Jul 2024 12:03:19 +0200 Subject: [PATCH] status: fix symlinks handling in Makefile install and deploy There is a mix of symlinks, some we want to copy as is and one that we want to dereference locally. So we need multiple steps to handle them. --- status/Makefile | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/status/Makefile b/status/Makefile index 151a790..dd0d61d 100644 --- a/status/Makefile +++ b/status/Makefile @@ -1,13 +1,16 @@ install: mkdir -p $(DESTDIR)/srv/http/status - cp -rL root/* $(DESTDIR)/srv/http/status + cp -r root/* $(DESTDIR)/srv/http/status + rm $(DESTDIR)/srv/http/status/favicon.ico + cp -L root/favicon.ico $(DESTDIR)/srv/http/status/ mkdir -p $(DESTDIR)/etc/nginx/http.d cp nginx.conf $(DESTDIR)/etc/nginx/http.d/status.conf mkdir -p $(DESTDIR)/home/damien/bin cp scripts/set-status $(DESTDIR)/home/damien/bin/set-status deploy: - rsync -azL --delete root/ chestnut:/srv/http/status/ + rsync -az --delete root/ chestnut:/srv/http/status/ + rsync -azL root/favicon.ico chestnut:/srv/http/status/ rsync -az scripts/ chestnut:~/bin/ .PHONY: deploy install -- 2.45.2