Upgrade to kiln 0.2

1 year ago · 04ef9421b8
parent f6a2f62c92
commit 04ef9421b8
49 changed files with 100 additions and 35 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1 +1 @@
-/dst
+/public
--- a/10
+++ b/10
@ -1,11 +1,11 @@
 default: build

 build:
-	@rm -rf dst
-	@kiln
-	chmod a+x dst/cgi-bin/*
-	@tree dst
+	@rm -rf public
+	@kiln build
+	chmod a+x public/cgi-bin/*
+	@tree public

 deploy: build
-	rsync --delete-after -avzP dst/ ur.gs:capsule/
+	rsync --delete-after -avzP public/ ur.gs:capsule/

--- a/config.ini
+++ b/config.ini
@ -1,2 +0,0 @@
-title = Nick Thomas
-url = gemini://ur.gs
--- a/config.toml
+++ b/config.toml
@ -0,0 +1,16 @@
+title="Nick Thomas"
+
+[[tasks]]
+input = [".gmi"]
+output = ".gmi"
+template = ".gmi"
+static_dir = "static"
+output_dir = "public"
+url = "gemini://ur.gs"
+
+[[tasks.feeds]]
+input_dir = "blog"
+title = "Nick Thomas"
+template = "atom.xml"
+output = "atom.xml"
+
--- a/content/_index.gmi
+++ b/content/_index.gmi
@ -1,4 +1,6 @@
-# Nick Thomas
+---
+title: "Nick Thomas"
+---

 ## Meta

@ -15,3 +17,6 @@
 => /cgi-bin/translate/es/en Español -> English

 ## About Me
+
+=> /blog/ Blog
+=> /travel/ Travelogue
--- a/content/blog/2013-09-14-dane-1.gmi
+++ b/content/blog/2013-09-14-dane-1.gmi
@ -1,4 +1,6 @@
-# DNSSEC + DANE: Part 1
+---
+title: "DNSSEC + DANE: Part 1"
+---

 ## Problem

--- a/content/blog/2013-09-15-dane-2.gmi
+++ b/content/blog/2013-09-15-dane-2.gmi
@ -1,4 +1,6 @@
-# DNSSEC + DANE: Part 2
+---
+title: "DNSSEC + DANE: Part 2"
+---

 Assuming you've been convinced that it's a good idea to set up DNSSEC and DANE,
 the point of this article is to demonstrate how I did it for my own domain - 
--- a/content/blog/2015-04-09-new-blog.gmi
+++ b/content/blog/2015-04-09-new-blog.gmi
@ -1,4 +1,6 @@
-# New Blogging Platform
+---
+title: "New Blogging Platform"
+---

 ## Alive again

--- a/content/blog/2015-04-19-pig-dog-01.gmi
+++ b/content/blog/2015-04-19-pig-dog-01.gmi
@ -1,4 +1,6 @@
-# The Capitalist Pig-Dog Blog
+---
+title: "The Capitalist Pig-Dog Blog"
+---

 ## Wat

--- a/content/blog/2015-04-24-pig-dog-02.gmi
+++ b/content/blog/2015-04-24-pig-dog-02.gmi
@ -1,4 +1,6 @@
-# The Capitalist Pig-Dog Blog: Starting Points
+---
+title: "The Capitalist Pig-Dog Blog: Starting Points"
+---

 ## Beliefs and values

--- a/content/blog/2015-05-01-pig-dog-03.gmi
+++ b/content/blog/2015-05-01-pig-dog-03.gmi
@ -1,4 +1,6 @@
-# The Capitalist Pig-Dog Blog: Income
+---
+title: "The Capitalist Pig-Dog Blog: Income"
+---

 ## Payday!

--- a/content/blog/2015-05-27-pig-dog-04.gmi
+++ b/content/blog/2015-05-27-pig-dog-04.gmi
@ -1,4 +1,6 @@
-# The Capitalist Pig-Dog Blog: Expenditure: Debt
+---
+title: "The Capitalist Pig-Dog Blog: Expenditure: Debt"
+---

 ## Apologies

--- a/content/blog/2015-06-15-festival-of-ideas-2015.gmi
+++ b/content/blog/2015-06-15-festival-of-ideas-2015.gmi
@ -1,4 +1,6 @@
-# York Festival of Ideas 2015
+---
+title: "York Festival of Ideas 2015"
+---

 ## Users vs. Techs

--- a/content/blog/2015-07-26-subsonic.gmi
+++ b/content/blog/2015-07-26-subsonic.gmi
@ -1,4 +1,6 @@
-# Subsonic and Licensing
+---
+title: "Subsonic and Licensing"
+---

 ## Subsonic

--- a/content/blog/2016-06-07-new-new-blog.gmi
+++ b/content/blog/2016-06-07-new-new-blog.gmi
@ -1,4 +1,6 @@
-# New, New Blogging Platform
+---
+title: "New, New Blogging Platform"
+---

 It's just over a year since I last changed blogging software!

--- a/content/blog/2017-11-16-email.gmi
+++ b/content/blog/2017-11-16-email.gmi
@ -1,4 +1,6 @@
-# Email!
+---
+title: "Email!"
+---

 ## Email sucks

--- a/content/blog/2020-01-15-stardew-valley.gmi
+++ b/content/blog/2020-01-15-stardew-valley.gmi
@ -1,4 +1,6 @@
-# Stardew Valley on aarch64
+---
+title: "Stardew Valley on aarch64"
+---

 At the end of last year I got a Pinebook Pro - mostly for reasons of paranoia.
 So far, it's been pretty good, but there was
--- a/content/blog/2022-01-02-pig-dog-05.gmi
+++ b/content/blog/2022-01-02-pig-dog-05.gmi
@ -1,4 +1,6 @@
-# The Capitalist Pig-Dog Blog: Coda
+---
+title: "The Capitalist Pig-Dog Blog: Coda"
+---

 ## Final apologies

--- a/content/blog/_index.gmi
+++ b/content/blog/_index.gmi
@ -0,0 +1,3 @@
+---
+title: "Blog posts"
+---
--- a/content/travel/2009-09-13-athens.gmi
+++ b/content/travel/2009-09-13-athens.gmi
@ -1,4 +1,6 @@
-# Athens, Greece
+---
+title: "Athens, Greece"
+---

 ## Itinerary

--- a/content/travel/_index.gmi
+++ b/content/travel/_index.gmi
@ -0,0 +1,3 @@
+---
+title: "Travel"
+---
--- a/src/blog/index.gmi
+++ b/src/blog/index.gmi
@ -1 +0,0 @@
-# Blog posts
--- a/src/img/index.gmi
+++ b/src/img/index.gmi
@ -1,3 +0,0 @@
-# Images
-
-Nothing to see here
--- a/src/img/pig-dog-01/index.gmi
+++ b/src/img/pig-dog-01/index.gmi
@ -1 +0,0 @@
-# Images for Capitalist Pig-Dog Blog: 01
--- a/src/img/pig-dog-02/index.gmi
+++ b/src/img/pig-dog-02/index.gmi
@ -1 +0,0 @@
-# Images for Capitalist Pig-Dog Blog: 02
--- a/src/img/pig-dog-05/index.gmi
+++ b/src/img/pig-dog-05/index.gmi
@ -1 +0,0 @@
-# Images for Capitalist Pig-Dog Blog: 05
--- a/src/pdf/index.gmi
+++ b/src/pdf/index.gmi
@ -1,3 +0,0 @@
-# PDFs and eBooks
-
-Nothing to see here
--- a/src/traces/index.gmi
+++ b/src/traces/index.gmi
@ -1 +0,0 @@
-# GPS traces
--- a/src/travel/index.gmi
+++ b/src/travel/index.gmi
@ -1 +0,0 @@
-# Travel
--- a/static/cgi-bin/debug
+++ b/static/cgi-bin/debug
--- a/static/cgi-bin/translate
+++ b/static/cgi-bin/translate
--- a/static/img/nick-thomas.jpg
+++ b/static/img/nick-thomas.jpg
--- a/static/img/pig-dog-01/politicalcompass-me.png
+++ b/static/img/pig-dog-01/politicalcompass-me.png
--- a/static/img/pig-dog-01/politicalcompass-uk-parties.png
+++ b/static/img/pig-dog-01/politicalcompass-uk-parties.png
--- a/static/img/pig-dog-02/expenses.png
+++ b/static/img/pig-dog-02/expenses.png
--- a/static/img/pig-dog-02/net-worth.png
+++ b/static/img/pig-dog-02/net-worth.png
--- a/static/img/pig-dog-05/chimney-state.jpg
+++ b/static/img/pig-dog-05/chimney-state.jpg
--- a/static/img/pig-dog-05/foundations-state.jpg
+++ b/static/img/pig-dog-05/foundations-state.jpg
--- a/static/img/pig-dog-05/groundwater-state.jpg
+++ b/static/img/pig-dog-05/groundwater-state.jpg
--- a/static/img/pig-dog-05/wall-state.jpg
+++ b/static/img/pig-dog-05/wall-state.jpg
--- a/static/me@ur.gs.gpg.asc
+++ b/static/me@ur.gs.gpg.asc
--- a/static/pdf/payling2014.pdf
+++ b/static/pdf/payling2014.pdf
--- a/static/robots.txt
+++ b/static/robots.txt
--- a/static/success.txt
+++ b/static/success.txt
--- a/static/traces/2018-08-16_19-06_Thu.gpx
+++ b/static/traces/2018-08-16_19-06_Thu.gpx
--- a/static/traces/2019-06-29_12-09_Sat.gpx
+++ b/static/traces/2019-06-29_12-09_Sat.gpx
--- a/templates/_default/atom.xml
+++ b/templates/_default/atom.xml
@ -0,0 +1,13 @@
+{{ `<?xml version="1.0" encoding="utf-8"?>` | safeHTML }}
+<feed xmlns="http://www.w3.org/2005/Atom">
+<id>{{ .URL }}</id>
+<title>{{ .Title }}</title>
+<updated>{{ site.Generated.Format "2006-01-02T15:04:05Z07:00" }}</updated>
+<link href="{{ .URL }}" rel="alternate"/>
+{{ range .Pages }}<entry>
+	<id>{{ .URL }}</id>
+	<title>{{ .Title }}</title>
+	<updated>{{ .Date.Format "2006-01-02T15:04:05Z07:00" }}</updated>
+</entry>
+{{ end -}}
+</feed>
--- a/templates/_default/index.gmi
+++ b/templates/_default/index.gmi
@ -0,0 +1,6 @@
+# {{ .Title }}
+{{ if .Content }}
+{{ .Content }}{{ end }}
+{{ range .Pages }}=> {{ .Path }} {{ if not .Date.IsZero -}}
+{{.Date.Format "2006-01-02"}} {{end}}{{.Title}}
+{{ end -}}
--- a/templates/_default/page.gmi
+++ b/templates/_default/page.gmi
@ -0,0 +1,5 @@
+# {{ .Title }}
+{{- if not .Date.IsZero }}
+Posted on {{ .Date.Format "2006-01-02" }} by Nick Thomas{{ end }}
+
+{{ .Content }}