Site refactor

.gitignore

@@ -4,3 +4,4 @@ public
 static/js/*.js
 static/css/*.css
 dev.pid
+auth.token

Makefile

@@ -1,9 +1,8 @@
-DNSZONE="libp2p.io"
-DNSRECORD="@"
+DOMAIN="libp2p.io"
 IPFSLOCAL="http://localhost:8080/ipfs/"
 IPFSGATEWAY="https://ipfs.io/ipfs/"
-NPM?=npm
 NPMBIN=./node_modules/.bin
+NPM=npm
 OUTPUTDIR=public
 PIDFILE=dev.pid
 
@@ -25,7 +24,7 @@ help:
 	@echo '   make dev                            Start a hot-reloding dev server on http://localhost:1313           '
 	@echo '   make dev-stop                       Stop the dev server                                                '
 	@echo '   make deploy                         Add the website to your local IPFS node                            '
-	@echo '   make publish-to-domain              Update $(DNSZONE) DNS record to the ipfs hash from the last deploy '
+	@echo '   make publish-to-domain              Update $(DOMAIN) DNS record to the ipfs hash from the last deploy  '
 	@echo '   make clean                          remove the generated files                                         '
 	@echo '                                                                                                          '
 
@@ -80,9 +79,9 @@ deploy:
 		echo "- ipfs pin add -r /ipfs/$$hash"; \
 		echo "- make publish-to-domain"; \
 
-publish-to-domain: install auth.token
-	DIGITAL_OCEAN=$(shell cat auth.token) $(NPMBIN)/dnslink-deploy \
-		--domain=$(DNSZONE) --record=$(DNSRECORD) --path=/ipfs/$(shell cat versions/current)
+publish-to-domain: auth.token versions/current
+	DNSIMPLE_TOKEN=$(shell cat auth.token) \
+	./dnslink.sh $(DOMAIN) $(shell cat versions/current)
 
 clean:
 	[ ! -d $(OUTPUTDIR) ] || rm -rf $(OUTPUTDIR) && \

README.md

@@ -20,6 +20,22 @@ git clone https://github.com/libp2p/website
 
 ## Usage
 
+To deploy the site libp2p.io, run:
+
+```sh
+# Build out the optimised site to ./public, where you can check it locally.
+make
+
+# Add the site to your local ipfs, you can check it via /ipfs/<hash>
+make deploy
+
+# Save your dnsimple api token as auth.token
+cat "<api token here>" > auth.token
+
+# Update the dns record for libp2p to point to the new ipfs hash.
+make publish-to-domain
+```
+
 The following commands are available:
 
 ### `make`
@@ -46,10 +62,15 @@ Optimise all the things!
 
 Build the site in the `public` dir and add to `ipfs` _(requires `hugo` & `ipfs` on your `PATH`)_
 
-### `make publish-to-domain`
+### `make publish-to-domain` :rocket:
+
+Update the DNS record for `libp2p.io`.  _(requires an `auto.token` file to be saved in the project root.)_
+
+If you'd like to update the dnslink TXT record for another domain, pass `DOMAIN=<your domain here>` like so:
 
-Update the DNS record for libp2p.io.  _(requires an `auto.token` file to be saved in the project root.)_
-:rocket:
+```sh
+make publish-to-domain DOMAIN=tableflip.io
+```
 
 ---
 
@@ -59,6 +80,7 @@ See the `Makefile` for the full list or run `make help` in the project root.
 
 * `hugo` to build website
 * `ipfs` to deploy changes
+* `jq`, `curl` and an `auth.token` file in the project root containing your dnsimple api token to update the dns.
 
 All other dependencies are pulled from `npm` and the Makefile will run `npm install` for you because it's nice like that.
 

dnslink.sh

@@ -0,0 +1,53 @@
+#!/usr/bin/env bash
+
+#
+# Usage:
+#   DNSIMPLE_TOKEN=<token> ./dnslink.sh <domain> <hash>
+#
+# Example:
+#   DNSIMPLE_TOKEN=trustno1 ./dnslink.sh website.protocol.ai Qmfoobar
+#
+# Dependencies:
+# - bash
+# - curl
+# - jq
+#
+# From:
+#   https://raw.githubusercontent.com/ipfs/infrastructure/master/scripts/dnslink.sh
+#
+
+set -e
+
+ZONE="$1"
+HASH="$2"
+
+([ ! -z "$DNSIMPLE_TOKEN" ] && [ ! -z "$ZONE" ] && [ ! -z "$HASH" ]) \
+  || (echo "Usage: DNSIMPLE_TOKEN=<token> ./dnslink.sh <domain> <hash>" && exit 1)
+
+RECORD_NAME="_dnslink"
+RECORD_TTL=120
+
+record_id=$(
+  curl -s "https://api.dnsimple.com/v1/domains/$ZONE/records?name=$RECORD_NAME&type=TXT" \
+    -H "X-DNSimple-Domain-Token: $DNSIMPLE_TOKEN" \
+    -H "Accept: application/json" \
+    | jq -r '.[].record.id'
+)
+
+if [ -z "$record_id" ]; then
+  curl -v -s -X POST "https://api.dnsimple.com/v1/domains/$ZONE/records" \
+    -H "X-DNSimple-Domain-Token: $DNSIMPLE_TOKEN" \
+    -H "Accept: application/json" \
+    -H "Content-Type: application/json" \
+    -d "{\"record\":{ \"name\":\"$RECORD_NAME\", \"record_type\":\"TXT\", \"content\":\"dnslink=/ipfs/$HASH\", \"ttl\":\"$RECORD_TTL\" }}" \
+    | jq -r '.record' \
+  && printf "\\nIt looks like we're good: https://ipfs.io/ipns/$ZONE\\n"
+else
+  curl -v -s -X PUT "https://api.dnsimple.com/v1/domains/$ZONE/records/$record_id" \
+    -H "X-DNSimple-Domain-Token: $DNSIMPLE_TOKEN" \
+    -H "Accept: application/json" \
+    -H "Content-Type: application/json" \
+    -d "{\"record\":{ \"content\":\"dnslink=/ipfs/$HASH\", \"name\":\"$RECORD_NAME\", \"ttl\":\"$RECORD_TTL\" }}" \
+    | jq -r '.record' \
+  && printf "\\nIt looks like we're good: https://ipfs.io/ipns/$ZONE\\n"
+fi