adamsgaard.dk

commit 45e69028b5b1b0801ee847166b90fc41538d3d99
parent 47fc5c240bcc3cfc46a19fbc63c703a5d24a8b7b
Author: Anders Damsgaard <anders@adamsgaard.dk>
Date:   Wed,  9 Dec 2020 11:47:28 +0100

replace atom feed on gopher host with gopher-referencing version

Diffstat:
M
Makefile
 | 
15
++++++++++-----
M
templates/index.gph/footer.gph
 | 
2
+-

2 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/Makefile b/Makefile
@@ -14,8 +14,7 @@ generate:
 		cat "$$f" >> "$$out"; \
 	done
 	sed -i 's,|\([A-z0-9-]*\)\.html|server|port,|/\1.txt|server|port,' $(output)/index.gph
-	sed 's,https://\(A-z0-9-_\.\)/atom.xml,gopher://\1/0/atom-gopher.xml,; \
-		s,https://adamsgaard.dk,gopher://adamsgaard.dk/0,g; \
+	sed 's,https://adamsgaard.dk,gopher://adamsgaard.dk/0,g; \
 		s,text/html,text,g; \
 		s,\.html,\.txt,g' \
 		$(output)/atom.xml > $(output)/atom-gopher.xml;
@@ -24,6 +23,9 @@ generate:
 		$(output)/ \
 		pages/*.txt \
 		/var/gopher/
+	rsync -ra \
+		$(output)/atom-gopher.xml \
+		/var/gopher/atom.xml
 
 view:
 	$(BROWSER) $(output)/index.html
@@ -37,15 +39,18 @@ converthtml:
 	done
 
 deploy: generate
-	rsync -rav --progress \
+	rsync -av --progress \
 		papers video img $(output)/ \
 		adamsgaard.dk:/var/www/domains/adamsgaard.dk/
-	rsync -rav --progress \
+	rsync -av --progress \
 		$(output)/ \
 		pages/*.txt \
 		adamsgaard.dk:/var/gopher/
+	rsync -av
+		$(output)/atom-gopher.xml \
+		adamsgaard.dk:/var/gopher/atom.xml
 
 clean:
-	rm -f -r $(output)/
+	rm -rf $(output)/
 
 .PHONY: default generate view deploy
diff --git a/templates/index.gph/footer.gph b/templates/index.gph/footer.gph
@@ -1,2 +1,2 @@
 
-[0|Atom feed|/atom-gopher.xml|server|port]
+[0|Atom feed|/atom.xml|server|port]