From c9a745e899c35e601fa7ed32c13f1a5823d81ecc Mon Sep 17 00:00:00 2001
From: Luke Murphy <lukewm@riseup.net>
Date: Sat, 4 Apr 2020 19:34:22 +0200
Subject: [PATCH] Rejig the makefile

---
 fabfile.py |  2 +-
 makefile   | 37 +++++++------------------------------
 2 files changed, 8 insertions(+), 31 deletions(-)

diff --git a/fabfile.py b/fabfile.py
index 45c20ec..6bede4c 100644
--- a/fabfile.py
+++ b/fabfile.py
@@ -7,6 +7,6 @@ from fabric import task
 def hbbs(c):
     """Release hbbs.decentral1.se."""
     with c.cd("/var/www/hbbs.decentral1.se"):
-        c.run("git pull origin master")
+        c.run("sudo -su www-data git pull origin master")
         c.run("sudo supervisorctl restart apps:hbbs")
         c.run("sudo systemctl reload nginx")
diff --git a/makefile b/makefile
index 8514de1..9cb2197 100644
--- a/makefile
+++ b/makefile
@@ -1,35 +1,12 @@
-ARCHIVE_DIR       := voicegardens/archive
-FIXED_ARCHIVE_DIR := voicegardens/fixed-archive
-REMOTE_HOST       := voicegardens.org
-SERVER            := voicegardens.server
-STATIC_DIR        := voicegardens/static
+REMOTE_HOST := hbbs.decentral1.se
+SERVER      := hbbs.server
 
-default: dev-serve
+default: serve
 
-dev-serve:
+.PHONY: serve
+serve:
 	@FLASK_ENV=development FLASK_APP=$(SERVER) flask run
 
-prod-serve:
-	@gunicorn --workers 1 --bind 9090 $(SERVER):app
-
-clear-local-archive:
-	@rm -rf $(ARCHIVE_DIR)/* && cp $(FIXED_ARCHIVE_DIR)/* $(ARCHIVE_DIR)
-
-doesitsparkjoy:
+.PHONY: hbbs
+hbbs:
 	@fab -H $(REMOTE_HOST) doesitsparkjoy
-
-voicegardens:
-	@fab -H $(REMOTE_HOST) voicegardens
-
-cleanarchives:
-	@fab -H $(REMOTE_HOST) cleanarchives
-
-dailycron:
-	@fab -H $(REMOTE_HOST) dailycron
-
-hourlycron:
-	@fab -H $(REMOTE_HOST) hourlycron
-
-release: doesitsparkjoy voicegardens
-
-.PHONY: dev-serve prod-serve clear-local-archive doesitsparkjoy voicegardens cleanarchives dailycron release