From c9bad3b9f69fd00c0205eafa77130316c130e04a Mon Sep 17 00:00:00 2001
From: "Jason A. Donenfeld" <Jason@zx2c4.com>
Date: Wed, 6 Jan 2021 13:51:13 +0100
Subject: Simpify deployment

---
 Makefile             | 22 +++++++---------------
 deployment-config.mk |  7 +++----
 2 files changed, 10 insertions(+), 19 deletions(-)

diff --git a/Makefile b/Makefile
index a4b2b97..8485dbe 100644
--- a/Makefile
+++ b/Makefile
@@ -8,23 +8,15 @@ deploy:
 	@echo "    SSH     $(WEB_SERVER)"
 	@ssh $(SSH_OPTS) -Nf $(WEB_SERVER)
 	
-	@echo "    RSYNC   . $(WEB_SERVER):$(FLASK_PATH)"
-	@ssh -t $(SSH_OPTS) $(WEB_SERVER) "sudo -u $(FLASK_USER) -v"
-	@rsync -aizm --delete-excluded --exclude=.ssh-deployment.sock --exclude=.git --exclude=Makefile --exclude="*.pyc" --exclude="*.mk" --exclude=.gitignore --exclude="*.swp" \
-		--filter="P pastes/" --rsh="ssh $(SSH_OPTS)" --rsync-path="sudo -n -u $(FLASK_USER) rsync" \
-		. "$(WEB_SERVER):$(FLASK_PATH)" 
+	@echo "    RSYNC   . $(WEB_SERVER):$(SERVER_PATH)"
+	@rsync -rltizm --delete-excluded --exclude=.ssh-deployment.sock --exclude=.git --exclude=Makefile --exclude="*.pyc" --exclude="*.mk" --exclude=.gitignore --exclude="*.swp" \
+		--filter="P pastes/" --rsh="ssh $(SSH_OPTS)" . "$(WEB_SERVER):$(SERVER_PATH)"
 	
-	@echo "    CHMOD   750/640 $(WEB_SERVER):$(FLASK_PATH)/*"
-	@ssh -t $(SSH_OPTS) $(WEB_SERVER) "sudo find -P '$(FLASK_PATH)' \! -path '$(FLASK_PATH)/pastes/*' -type f -exec chmod 640 {} \;; \
-					   sudo find -P '$(FLASK_PATH)' \! -path '$(FLASK_PATH)/pastes/*' -type d -exec chmod 750 {} \;;"
+	@echo "    MKDIR   $(WEB_SERVER):$(SERVER_PATH)/pastes"
+	@ssh $(SSH_OPTS) $(WEB_SERVER) "mkdir -m 730 -p '$(SERVER_PATH)/pastes' && chgrp $(MUTABLE_FILE_GROUP) '$(SERVER_PATH)/pastes';"
 	
-	@echo "    CHOWN   $(FLASK_USER):$(NGINX_USER) $(WEB_SERVER):$(FLASK_PATH)/pastes"
-	@ssh -t $(SSH_OPTS) $(WEB_SERVER) "sudo mkdir -p '$(FLASK_PATH)/pastes'; sudo chown $(FLASK_USER):$(NGINX_USER) '$(FLASK_PATH)' '$(FLASK_PATH)/pastes'"
-	@echo "    CHMOD   710 $(WEB_SERVER):$(FLASK_PATH)"
-	@ssh -t $(SSH_OPTS) $(WEB_SERVER) "sudo chmod 710 '$(FLASK_PATH)'"
-	
-	@echo "    UWSGI   restart $(WEB_SERVER)"
-	@ssh -t $(SSH_OPTS) $(WEB_SERVER) "sudo /etc/init.d/uwsgi restart"
+	@echo "    UWSGI   restart"
+	@ssh $(SSH_OPTS) $(WEB_SERVER) "systemctl restart uwsgi@emperor.service"
 	
 	@echo "    SSH     $(WEB_SERVER)"
 	@ssh -O exit $(SSH_OPTS) $(WEB_SERVER)
diff --git a/deployment-config.mk b/deployment-config.mk
index 114382a..2d20fb0 100644
--- a/deployment-config.mk
+++ b/deployment-config.mk
@@ -1,4 +1,3 @@
-WEB_SERVER := metheny.zx2c4.com
-NGINX_USER := nginx
-FLASK_USER := alephpaste
-FLASK_PATH := /var/www/uwsgi/alephpaste
+WEB_SERVER := root@abercrombie.zx2c4.com
+MUTABLE_FILE_GROUP := http
+SERVER_PATH := /var/www/uwsgi/alephpaste
-- 
cgit v1.2.3-59-g8ed1b