From e2176950366a61c2aa67996883d2f6d178c17561 Mon Sep 17 00:00:00 2001 From: Andreas Neue Date: Mon, 5 Jun 2023 11:40:16 +0200 Subject: [PATCH] cron.mk: use sudo -u for crontab -e --- Makefile | 2 +- cron.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 3508c8b..29f5a4f 100644 --- a/Makefile +++ b/Makefile @@ -93,7 +93,7 @@ ifdef DEPLOY_HOSTS @- $(foreach host,$(DEPLOY_HOSTS), \ ssh $(SSH_USER)@$(host) "mkdir -p $(DEPLOY_PATH)/$(DEPLOY_NAME)"; \ rsync -rav --exclude '*~' --exclude '.git*' --exclude '*.swp' . $(SSH_USER)@$(host):$(DEPLOY_PATH)/$(DEPLOY_NAME); \ - ssh $(SSH_USER)@$(host) "cd $(DEPLOY_PATH)/$(DEPLOY_NAME) && chmod o-r .env secrets*" \ + ssh $(SSH_USER)@$(host) "cd $(DEPLOY_PATH)/$(DEPLOY_NAME) && chmod o-r .env secrets*"; \ ) endif diff --git a/cron.mk b/cron.mk index 4b2d3a7..50cb506 100644 --- a/cron.mk +++ b/cron.mk @@ -4,7 +4,7 @@ start-cron: @- echo "\n### starting..." @- $(foreach host,$(DEPLOY_HOSTS), \ echo "$(host)"; \ - ssh $(SSH_USER)@$(host) "crontab -l | sed \"/^#make-deploy-cron:$(DEPLOY_NAME)/,+1 d\" | { cat; echo \"#make-deploy-cron:$(DEPLOY_NAME)\"; cat \"$(DEPLOY_PATH)/$(DEPLOY_NAME)/crontab\"; } | crontab -"; \ + ssh $(SSH_USER)@$(host) "sudo -u $(CRON_USER) sh -c 'crontab -l | sed \"/^#make-deploy-cron:$(DEPLOY_NAME)/,+1 d\" | { cat; echo \"#make-deploy-cron:$(DEPLOY_NAME)\"; cat \"$(DEPLOY_PATH)/$(DEPLOY_NAME)/crontab\"; } | crontab -"'; \ sleep $(DEPLOY_START_DELAY); \ ) @@ -12,7 +12,7 @@ stop-cron: @- echo "\n### stopping ..." @- $(foreach host,$(DEPLOY_HOSTS), \ echo "$(host)"; \ - ssh $(SSH_USER)@$(host) "crontab -l | sed \"/^#ck-deploy-cron:$(DEPLOY_NAME)/,+1 d\" | crontab -"; \ + ssh $(SSH_USER)@$(host) "sudo -u $(CRON_USER) sh -c 'crontab -l | sed \"/^#make-deploy-cron:$(DEPLOY_NAME)/,+1 d\" | crontab -"'; \ ) pull-cron: