From 5b1d5ff64c3ef32582c050a8e45f02543b8fa57b Mon Sep 17 00:00:00 2001 From: "Adam A.G. Shamblin" Date: Sun, 14 Apr 2019 09:25:56 -0600 Subject: [PATCH] Update deployment and build flags, minor configuration tweaks, keybase proof. --- Dockerfile | 2 +- content/chapter-n-the-box-maker.md | 41 ++++++++++++++++++++++ content/files/keybase.txt | 56 ++++++++++++++++++++++++++++++ content/files/robots.txt | 2 ++ hack/k8s/deployment.yaml | 1 + pelicanconf.py | 10 +++++- publishconf.py | 9 ++--- 7 files changed, 113 insertions(+), 8 deletions(-) create mode 100644 content/chapter-n-the-box-maker.md create mode 100644 content/files/keybase.txt create mode 100644 content/files/robots.txt diff --git a/Dockerfile b/Dockerfile index a74d73e..2cf8951 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM python:3.7.3 COPY . /build/ WORKDIR /build/ RUN pip install -r requirements.txt -RUN pelican content +RUN pelican content -s publishconf.py FROM nginx COPY --from=0 /build/output/ /usr/share/nginx/html/ diff --git a/content/chapter-n-the-box-maker.md b/content/chapter-n-the-box-maker.md new file mode 100644 index 0000000..74e6fd6 --- /dev/null +++ b/content/chapter-n-the-box-maker.md @@ -0,0 +1,41 @@ +Title: The Box Maker +Date: 2019-04-13 +Category: Fiction +Tags: bolo'bolo, fiction +Slug: the-box-maker +Status: draft + + +It had been many years since we had called on the box maker. Not that any +calling had taken place. We don't order taku, per se, but word gets around of a +new ibu and the box maker begins his work. + +Most taku have been around for generations. Sometimes, on sad occasions, a +child will inherit his taku from a parent, though most times from a grandparent +or someone from the bolo who left is or hers without heir. + +For quite a while wood was scarce. New, raw materials of any kind were hard to +get as new trade routes were established - a process made to take even longer as +some bolo, made aggressive by fear and slower to come to terms with this new +reality, sought monopoly over anything of value. + +Taku then, some of the first made, were hammered out of sheet metal skinned from +now immobile carcasses of automobiles. There was little craft in these boxes, +though they were no less loved, no less important. Care and use wore down rough +edges - along with any paint - as ibu stowed and retreived their few, precious +possessions. + +--- + +He sounded out the words as he carved: Long, round vowels made longer with +effort, deep lines etched into surface of the box intended to last generations. +His rough hands followed close behind the chisel. Brushing away the chipped +wood, he was satisfied with cuts skillfully made through careful practice. This, +he knew, was to be an artifact of significance, an integral part of his +community and culture, and a symbol of what his world had become and what it +cost to get here. + +It had been many years since anyone had called upon the box maker, not that any +calling had taken place. Taku aren't ordered, per se, but a need arises, word +gets around, and the box maker begins his work. Every soul gets a box, this goes +without question, there is no need for discussion. diff --git a/content/files/keybase.txt b/content/files/keybase.txt new file mode 100644 index 0000000..d7cff86 --- /dev/null +++ b/content/files/keybase.txt @@ -0,0 +1,56 @@ +================================================================== +https://keybase.io/signal9 +-------------------------------------------------------------------- + +I hereby claim: + + * I am an admin of https://letters.vexingworkshop.com + * I am signal9 (https://keybase.io/signal9) on keybase. + * I have a public key ASAMPjTezGalwRLCaMjG6_Q2yDhTgxXJ3iJc9zX6XeEu0Ao + +To do so, I am signing this object: + +{ + "body": { + "key": { + "eldest_kid": "0120f184075250f27a00b7598e2220192d271bba153927553fd06d3d6902f51cf4170a", + "host": "keybase.io", + "kid": "01200c3e34decc66a5c112c268c8c6ebf436c838538315c9de225cf735fa5de12ed00a", + "uid": "9017be00597e47ab643335140ad2ec19", + "username": "signal9" + }, + "merkle_root": { + "ctime": 1555254389, + "hash": "da41d4c3af0ae986eb06399423b18af839c47ae5b96481bb64592cc2b1b4dd136def878c8a13d1c9a9809b44112a210f1b71638c20b495bd3129d81d6ac246c1", + "hash_meta": "dac869f838477ce6d8d4ca7169b70df7d318b891b3b2fd6317a3fc8031d2a525", + "seqno": 5165243 + }, + "service": { + "entropy": "A4uLhHkPuWjA06vpqdBUlkCW", + "hostname": "letters.vexingworkshop.com", + "protocol": "https:" + }, + "type": "web_service_binding", + "version": 2 + }, + "client": { + "name": "keybase.io go client", + "version": "3.2.2" + }, + "ctime": 1555254402, + "expire_in": 504576000, + "prev": "3bc66f964b4e92460c4933d9b81e9ff3bdb180ca28aedce232749cd8b5b712c1", + "seqno": 37, + "tag": "signature" +} + +which yields the signature: + +hKRib2R5hqhkZXRhY2hlZMOpaGFzaF90eXBlCqNrZXnEIwEgDD403sxmpcESwmjIxuv0Nsg4U4MVyd4iXPc1+l3hLtAKp3BheWxvYWTESpcCJcQgO8ZvlktOkkYMSTPZuB6f872xgMoortziMnSc2LW3EsHEIGr8oFew02OA7ydlvEUarGfjL6t/totJ/gH4bZ+jJ6kaAgHCo3NpZ8RAprBkm3BUsxFV6W0MPwjOxEQcBvGIqhFysBtRqvNzXvB+NxxOQKBi/zLeJHXTHYgPbnAGuJxqZUNyo4kXA53iAKhzaWdfdHlwZSCkaGFzaIKkdHlwZQildmFsdWXEIG/ZNXWs4J61JhgPffpruIbgeVzto5DS+th7yD0OuOZXo3RhZ80CAqd2ZXJzaW9uAQ== + +And finally, I am proving ownership of this host by posting or +appending to this document. + +View my publicly-auditable identity here: https://keybase.io/signal9 + +================================================================== \ No newline at end of file diff --git a/content/files/robots.txt b/content/files/robots.txt new file mode 100644 index 0000000..eb05362 --- /dev/null +++ b/content/files/robots.txt @@ -0,0 +1,2 @@ +User-agent: * +Disallow: diff --git a/hack/k8s/deployment.yaml b/hack/k8s/deployment.yaml index 35f9eb4..36534fd 100644 --- a/hack/k8s/deployment.yaml +++ b/hack/k8s/deployment.yaml @@ -27,5 +27,6 @@ spec: containers: - name: letters image: vexingworkshop/letters:latest + imagePullPolicy: Always ports: - containerPort: 80 diff --git a/pelicanconf.py b/pelicanconf.py index 3f003c0..74d3844 100644 --- a/pelicanconf.py +++ b/pelicanconf.py @@ -5,9 +5,17 @@ from __future__ import unicode_literals AUTHOR = 'signal9' SITENAME = 'Letters' SITESUBTITLE = 'from the workshop' -SITEURL = '' +SITEURL = 'https://letters.vexingworkshop.com' PATH = 'content' +STATIC_PATHS = [ + 'files/keybase.txt', + 'files/robots.txt' +] +EXTRA_PATH_METADATA = { + 'files/keybase.txt': {'path': 'keybase.txt'}, + 'files/robots.txt': {'path': 'robots.txt'} +} TIMEZONE = 'America/Denver' diff --git a/publishconf.py b/publishconf.py index 59905aa..b728f2a 100644 --- a/publishconf.py +++ b/publishconf.py @@ -14,12 +14,9 @@ from pelicanconf import * SITEURL = 'https://letters.vexingworkshop.com' RELATIVE_URLS = False +FEED_ALL_RSS = 'feeds/all.rss' +CATEGORY_FEED_RSS = 'feeds/{slug}.rss' FEED_ALL_ATOM = 'feeds/all.atom.xml' CATEGORY_FEED_ATOM = 'feeds/{slug}.atom.xml' -DELETE_OUTPUT_DIRECTORY = True - -# Following items are often useful when publishing - -# DISQUS_SITENAME = "" -# GOOGLE_ANALYTICS = "" +DELETE_OUTPUT_DIRECTORY = False -- 2.39.5