From 3c35b8fbed5fd50d7aed85e7f42f295640602740 Mon Sep 17 00:00:00 2001 From: rsiddharth Date: Sat, 16 Nov 2019 16:10:40 -0500 Subject: Makefile: Remove prd-user Integrate it into prd-init. --- Makefile | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index dc6031a..5865125 100644 --- a/Makefile +++ b/Makefile @@ -55,12 +55,17 @@ build: prd-init: ssh root@${PRD_HOST} \\"echo 'https://cdn.openbsd.org/pub/OpenBSD' \ > /etc/installurl \ - && pkg_add -v git redis py3-virtualenv cowsay rsync \ + && pkg_add -I -v git redis py3-virtualenv cowsay rsync \ && git config --global --add user.name rsiddharth \ && git config --global --add user.email s@ricketyspace.net \ && git -C /etc init \ && git -C /etc add . \ && git -C /etc commit -m 'Initial commit' \ + && useradd -v -c 'NFSW daemon' \ + -e 0 -L daemon -s /sbin/nologin \ + -d /var/empty _nfsw \ + && git -C /etc add . \ + && git -C /etc commit -m 'Add _nfsw user'\\" .PHONY: prd-init @@ -77,13 +82,6 @@ prd-acme: .PHONY: prd-acme -prd-user: - ssh root@${PRD_HOST} \\"useradd -v -c 'NFSW daemon' \ - -e 0 -L daemon -s /sbin/nologin \ - -d /var/empty _nfsw\\" -.PHONY: prd-user - - prd-venv: ssh root@${PRD_HOST} \\"mkdir -p /usr/local/virtualenv/ && \ ${VENV_CMD} --clear --python=python3 \ -- cgit v1.2.3