Fix user creating error. Ensuring user exists
This commit is contained in:
parent
ab2a77716f
commit
c7fdd60fe7
48
Makefile
48
Makefile
@ -1,37 +1,39 @@
|
||||
PROJECT := certificate-expire-check
|
||||
USER := $(PROJECT)
|
||||
INSTALL_DIR := /etc/$(PROJECT)
|
||||
CONF_DIR := $(INSTALL_DIR)/conf
|
||||
SCRIPT := $(INSTALL_DIR)/main.py
|
||||
CRON_SCHEDULE:= 0 0 */10 * *
|
||||
PROJECT := certificate-expire-check
|
||||
USER := $(PROJECT)
|
||||
INSTALL_DIR := /etc/$(PROJECT)
|
||||
SCRIPT := $(INSTALL_DIR)/main.py
|
||||
CRON_SCHEDULE := 0 0 */10 * *
|
||||
|
||||
.PHONY: all user install cron clean
|
||||
|
||||
all: user install cron
|
||||
all: install cron
|
||||
|
||||
user:
|
||||
@id -u $(USER) &>/dev/null || \
|
||||
sudo useradd --system --no-create-home --shell /usr/sbin/nologin $(USER) && \
|
||||
echo "User '$(USER)' has been created."
|
||||
@echo "User '$(USER)' already exists - skip it."
|
||||
@echo "==> Ensuring user '$(USER)' exists…"
|
||||
@sudo getent passwd $(USER) > /dev/null 2>&1 || \
|
||||
( sudo useradd --system --no-create-home --shell /usr/sbin/nologin $(USER) && \
|
||||
echo "User '$(USER)' created." )
|
||||
@echo "User '$(USER)' ready."
|
||||
|
||||
# Copy the project to /etc and set permissions
|
||||
install: user
|
||||
sudo mkdir -p $(INSTALL_DIR)
|
||||
sudo cp -r ./* $(INSTALL_DIR)
|
||||
sudo chown -R $(USER):$(USER) $(INSTALL_DIR)
|
||||
@echo "The project is installed in $(INSTALL_DIR) and permissions are assigned to user '$(USER)'."
|
||||
@echo "==> Installing project to $(INSTALL_DIR)…"
|
||||
@sudo mkdir -p $(INSTALL_DIR)
|
||||
@sudo cp -r ./* $(INSTALL_DIR)
|
||||
@sudo chown -R $(USER):$(USER) $(INSTALL_DIR)
|
||||
@echo "Installed and chown → $(USER):$(USER)."
|
||||
|
||||
# Add a cron job as a user
|
||||
cron: install
|
||||
@CRON_LINE="$(CRON_SCHEDULE) /usr/bin/python3 $(SCRIPT) >> /var/log/$(PROJECT).log 2>&1"
|
||||
# add CRON_LINE in user crontab if not exists
|
||||
@sudo crontab -u $(USER) -l 2>/dev/null | grep -F "$$CRON_LINE" >/dev/null || \
|
||||
( sudo crontab -u $(USER) -l 2>/dev/null; echo "$$CRON_LINE" ) | sudo crontab -u $(USER) -
|
||||
@echo "Cron entry for user '$(USER)' is set: $$CRON_LINE"
|
||||
@echo "==> Configuring cron job…"
|
||||
@CRON_LINE="$(CRON_SCHEDULE) $(USER) /usr/bin/python3 $(SCRIPT) >> /var/log/$(PROJECT).log 2>&1"
|
||||
@sudo crontab -u $(USER) -l 2>/dev/null | grep -F "$$CRON_LINE" \
|
||||
|| ( sudo crontab -u $(USER) -l 2>/dev/null; echo "$$CRON_LINE" ) \
|
||||
| sudo crontab -u $(USER) -
|
||||
@echo "Cron line for '$(USER)':"
|
||||
@echo " $$CRON_LINE"
|
||||
|
||||
clean:
|
||||
@echo "==> Cleaning up…"
|
||||
-sudo crontab -u $(USER) -r
|
||||
-sudo userdel $(USER)
|
||||
-sudo rm -rf $(INSTALL_DIR)
|
||||
@echo The cleanup is complete."
|
||||
@echo "Cleanup done."
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user