From: Adam A.G. Shamblin Date: Thu, 11 Apr 2019 00:14:45 +0000 (-0600) Subject: Remove test files, Dockerize, update deployment. X-Git-Url: https://git.vexinglabs.com/?a=commitdiff_plain;h=8d3421dd3b89d3468aa066869414bc32f7e5ff81;p=letters.git Remove test files, Dockerize, update deployment. --- diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..486ec6c --- /dev/null +++ b/Dockerfile @@ -0,0 +1,3 @@ +FROM nginx + +COPY output/ /usr/share/nginx/html/ diff --git a/content/another-test.en.rst b/content/another-test.en.rst deleted file mode 100644 index 8b46d7d..0000000 --- a/content/another-test.en.rst +++ /dev/null @@ -1,8 +0,0 @@ -Do Another Test -############### - -:date: 2019-04-07 -:tags: tech -:category: tech - -Another test of the system, categories, etc. diff --git a/content/hardening_notes.md b/content/hardening_notes.md index d8de92b..7c8a035 100644 --- a/content/hardening_notes.md +++ b/content/hardening_notes.md @@ -1,7 +1,14 @@ Title: Science Friday - Basic Setup and Hardening of a Linux Server -Date: 2019-06-24 +Date: 2019-04-10 Category: Security +## What's this? + +I put this guide together a couple of years ago for a number of friends of mine, +so that we had a baseline Debian setup for future projects. There are certainly +more or other things you can do to a new Linux installation, but this is what I +find to be a good, minimal, starting point. + ## Prerequisites - Install [VirtualBox](https://www.virtualbox.org/) for your platform diff --git a/content/pages/about.en.rst b/content/pages/about.en.rst index 478a5a6..ab93d20 100644 --- a/content/pages/about.en.rst +++ b/content/pages/about.en.rst @@ -1,4 +1,27 @@ About ##### +My name is Adam. I am an aging engineer, tinker, hippy and anarchist. I love +science fiction novels, doom metal, board games and motorcycles. +I've been working on the web since the late nineties. I miss the internet I +believed we were building back then, I liked it when Linux was hard, and get of +my lawn. Our greed led us to build a techno-dystopia instead of the utopia we +owe ourselves, but I'm not convinced that fight is over yet. + +I don't waste much time on belief, and I have no patience for -isms. That being +said, "Every man and every woman is a star." I do believe in the individual's +inherent right to freedom, but Don't Tread On Me is utter bullshit. If you're +free and I'm free, stuff is complicated and we have to work together. + +I'm a hacker but I like making things more than I like breaking things. I like +starting projects more than I like finishing them, but I also love convincing +others to finish what I've started. + +This is a place for me to get some things out, to share things I've tinkered +with and maybe where I can learn some new things. Cheers. + +Adam A.G. Shamblin +- Architect +- Tom Sawyer +- Con Man diff --git a/content/pages/keys.en.rst b/content/pages/keys.en.rst index 7070910..96ea1c7 100644 --- a/content/pages/keys.en.rst +++ b/content/pages/keys.en.rst @@ -1,2 +1,74 @@ Keys #### + +:date: 2019-04-07 +:tags: keys, pgp, gpg, security, identity +:category: security + +:: + + -----BEGIN PGP PUBLIC KEY BLOCK----- + + mQENBFjhkWMBCAC3pthym9W/Ux5QSOEQdHnVp3pmS34GOl+pB+W4T6bHzwp6vUio + QdsUeqgAx80LsHj0XgwJsWRT6FSm+wxrXJcLjrLjkNP0P4x40Z/e7TVFW36mLCtn + u3P6Dz3JqpQWv9Zo+NS5X73yvtM4dLaWXqG7STDBzXS3vhFJCnyfrxLhwmcXQuAg + j8QJ35yAa1K3G4KwbJQMxfedexFEpVceySkWmeGmIGqw00tORkgnfpCpg4d9O5+z + 5WXR4zuX1ymDz2wUyUdtH5sg5gwEQdSNp2YQZTnepbKhwGTeQJxiF0pX/BHtFI5m + 3DdRhU8GCaVZOGbEYaGrCXywSRPDUc11iSl/ABEBAAG0L0FkYW0gQS5HLiBTaGFt + YmxpbiA8YWRhbS5zaGFtYmxpbkB0dXRhbm90YS5jb20+iQE9BBMBCgAnAhsDBQsJ + CAcDBRUKCQgLBRYCAwEAAh4BAheABQJcqhatBQkF9i/KAAoJEEOZQ9ugXZ82ByAI + AIA4LjaeNN1XWvO9PykY2TiRLzoJclhCvijl4t9XSnWd/BxyrJpBqM4tqFdvQeRh + vKH1pAZaDxwShniu+gQY6aluGr57BB7S/sLgeBNkQOiaK72VaDdf6Al0R/2euH5Q + oHgTGQi0JIw6L3ejhYtRLCpcFow4Onrt7WwGcOn+1qFNb+l4TtjkJr4eiOPv1pyN + 8tnX3X5Uz6YHOPjZchLdnmFtD4pDmdizIIpXo0RJYqG+kwn/rgjogY9F28F/RQD3 + bR9z+QraP67hkLlpuYei82R5vhV2ulieeQQG3HG5ezoEbbsPRc5uOmRH5z8aj76B + qTbakifCLeNkVQT3f3M/SlqJAhwEEAEIAAYFAljkS/AACgkQyPHNn70wPa/+NA/9 + HdFkAEpIe8L1/EycRY1XYwBAOxAtvoWO4ieSOiyKWsLInrIbsMJ4Ac/Mp/+cwSJH + 2vqkiK2Oxkza9yQMVBEhGEF9OjECaV4cveL82zQRFwPWesfqtMpe52BHUlSMhcuI + dCHocc+uSxD2GRtfbd9CRfXhThtamz8ua34JcNBPouQRRzuEBEC89aXijCc9NHd+ + OV4Wdw3IE99QP4qrMppxHc2LYe5z+IqlPianMocejx6/vRAVD1J+1NNteBXfegZc + nwvmCag5ICr4Lf49Y5FxeiqXQNBZJasbPX0qtmwYPCFxNyuMZBt/hVQiM1t2yISu + nnoht/HY3+QF+GSFGBgzzpnGaB7xcHf1NIK08yW0zNGCuSoOhxvwP7hLsWnb7Sdx + 7hWiX0a5jGvW/7Qd5eNnrBZRdqy95e0L8LZQlf6g7aw+lzaEmGnA3UAR+FcZ4UO1 + ogyHOg8jTBLVNyFL5kfrJAWnlPIYaJL4+DkB2GgaBg1nNYXawEVvkXVawekH943h + Y/cOE5oZ8ZCTRFzxxu8pvjtZo2mi635R61EBYL79CVIJxjQ0d4feQ48D761OPFj3 + 6S7kxR5Wqs80X99d1mgF+ly6neuj0ngesGwei4c6w2gv44oX8W4gEHT78EloLHw6 + cxRf6xAuqDuohSySRJfelcQ79wAR+yWtKiuUTU8pUOWJAhwEEAEKAAYFAljkTncA + CgkQevlgjPwbZDY0kBAAokuazDXmZ7RIWBVU/XXU59tU9bJiP1IdhSpRkCSlduM1 + yd2vaMEs82Vvl04mvdLSQ6ln788kkH19ouP3PQbtej3nm4UBvcYttGtrB41Lwu+V + H2GC3GrcUtf4ooAHwcILftq39UVs2zc9AglJ7+Ow7ZNOLwhNNrBI+mddXufcIwLc + JAkZGxLcYnkKXMGV2nq3DLw4CQtSokOIODpahAk8L/iHjvAI/xywhfRme+rzkY1K + aB42u5pPmwS+YdMZHVkYPnnfcJwCX8zrNyN2L+iqdnw3aVFC8hKoAKpjUsGE2F/l + szkjcj4SWzQvRYOPd/o3cpXhuA3HUQqIZ539OTEyoq6C4rC/R6WU5vy0ewCcsjxO + 6AnWUUzjKJ2VVen18KF4Te3ELUdwZTAsBYSdOnoCRSJjYGX+FFC8B8SPmgoUUeH4 + 0F5sqC93XhwMaDgXZayeoT+hClOtsj2zU5o/hLPnXD+vCUYql5tzWsd++2df95nl + kaTt31shVbUdj0L8h9bk5vEnfNNel8xSqU+uNr+kP/gUEwAQ3BwXJPQO2AW12Y9l + DMYG/rnlicwEH0jexrncNGRhkV80X3VZR0KYam+xStZkP2eVWE9ZWB/AhgZxrpeh + ddf59Y3C4Mrs1H9YmYv0trwLZ7y/aaNThBcvXhiHthY9gUw08GPgUKS3Z1NY3seJ + AhwEEAEIAAYFAlmY/KwACgkQFlFBqwUYxEY3Sw/+Iji3xcN0jcg6qbWSc3KoKMQo + gpn3a9yw5s0mBQA0TUZ4MRdf5aUlLDZyIRxyOqburPyW4sWMuhniCNMVbEa8CHfF + fun0sImCTFD6LZO2pg6fq9Bvt+WC8wTeTdcvS/ZiHsRfDU+IMzA4nhoIgpOaxJ+/ + A1AimpGTx3fLxXJz722Yg1rLtTUgj9IHt7FyDCVhWIc08Yg3IR6McOIi//LQUiQF + EGUJcEz91AIBZ4gbvz8MIpYVBRkeRmLuIR6GPFVYrDoSNz0MdNblMqxQg36JOdvB + 35+o88Tphfcm0gtnsPfq8EZAuSq4cnxAqP4sRpGeAk00nqQEcUYO7DvhFcvZI17b + AGgm1smVwh1Ekxu2LRPmNRjkC6JafRYUuJJrIjkohLDH/47p4QQFkDWkTNWl2eI3 + 6kccBI+P5Y4cn8VxzF0iL8MpB/L/9NRAIQgbHtBAKwKxDkb5m/gPeJQpP5I2jRjg + mdHJ1teFEDGKlTUUKy9ge82r+VUR6s1TDmTUXcvgtKgoFFtTxDNYnmgN2P5MCEfj + d71AqjGoZWdj61QCodoaPaKNax+1ByxVcoeiK9dikN9p0+vLhYg8AmmtCE4qKbzw + dYheQPIWKC+hxtlklnmQ1yuL55hb7lyGWxKsIMinx6I1JrQdoS28HEcNcFbQdFn8 + dhoE1/P6VY9pXeT3HXm5AQ0EWOGRYwEIANCe//U+D4eqMEgovbOW31Hw+X3h21X/ + LCewnR95kD/35CMF3WgX5HevFUbq2EF+iOxAlqRrGyx/nidIQ++4lFDicKfRML6J + 03Bl4Wq5/IWAIqivDsI9lL6Rse5b9wCIUPLMnx6S7E238phvm+6C99plu6+QQBXz + mfWkX6L6ccZfh5QvE5zaqY84vr51J3X2mypPh8k7Qajl/ASP3bbbzeM6axVwX2OK + 9y8JnQ2QUabgUdg5vFLWU5zKhQxU7RAriCyExb7BgRE5KvX+AYQyRqRTwL0RC/by + /JyXvwDKREwBtV8GvnzjDCcB85A4w6RYVD8tpUZLSoZD0aLrw6zNfycAEQEAAYkB + JQQYAQoADwUCWOGRYwIbDAUJAeEzgAAKCRBDmUPboF2fNlYYCACHQYAnPdp/uMey + +NsnnVjyjaxW5gQp4wRSv4cMKFBTZcWF0PreuYQphpqYexlKs+1mX6BM0IGDJMiq + O7SS1hE3PzZgL9V8CGHgFfCk2l3L3oPAvkzfGMNdkeCtBP5YEmJcbHKg1tpXXJit + SRGuaWXpvXQhFxmqisI8JvhmEf1WfH9dzd4pgZD43lj1vVFuRZW3iXRCncvS9cQo + vyeS3hZv/uSQjslKa2/8a7hSrI4TMSoXLrhEi0BtNolWFFRGzPEdWcVfUj6icp6U + h7OZFBMf+5QxtSUtBJ21J85gHaREEoR99ZyYDrf8RNPS4kxAGb9kKYQg+gy/EgOc + 9pOghseN + =RYUU + -----END PGP PUBLIC KEY BLOCK----- + diff --git a/content/test.en.rst b/content/test.en.rst deleted file mode 100644 index 80e3158..0000000 --- a/content/test.en.rst +++ /dev/null @@ -1,9 +0,0 @@ -Dig my crazy article -#################### - -:date: 2019-04-06 21:48 -:category: Test -:slug: testing-translations-in-pelican -:lang: en - -This is a test diff --git a/content/test.eo.rst b/content/test.eo.rst deleted file mode 100644 index 8eb2d67..0000000 --- a/content/test.eo.rst +++ /dev/null @@ -1,9 +0,0 @@ -Kompreni mi freneza artikolon -############################# - -:date: 2019-04-06 21:48 -:category: Test -:slug: testing-translations-in-pelican -:lang: eo - -Ĉi tiu estas testo. diff --git a/hack/k8s/deployment.yaml b/hack/k8s/deployment.yaml new file mode 100644 index 0000000..35f9eb4 --- /dev/null +++ b/hack/k8s/deployment.yaml @@ -0,0 +1,31 @@ +kind: Service +apiVersion: v1 +metadata: + name: letters +spec: + selector: + app: letters + ports: + - protocol: TCP + port: 80 + targetPort: 80 +--- +kind: Deployment +apiVersion: apps/v1 +metadata: + name: letters-deployment +spec: + replicas: 1 + selector: + matchLabels: + app: letters + template: + metadata: + labels: + app: letters + spec: + containers: + - name: letters + image: vexingworkshop/letters:latest + ports: + - containerPort: 80 diff --git a/pelicanconf.py b/pelicanconf.py index 62d3b99..3f003c0 100644 --- a/pelicanconf.py +++ b/pelicanconf.py @@ -19,7 +19,7 @@ CATEGORY_FEED_ATOM = None TRANSLATION_FEED_ATOM = None AUTHOR_FEED_ATOM = None AUTHOR_FEED_RSS = None -# THEME = 'letters' +THEME = './themes/letters' # Blogroll LINKS = (('Electronic Frontier Foundation', 'https://www.eff.org'),) diff --git a/themes/letters/static/images/favicon.ico b/themes/letters/static/images/favicon.ico new file mode 100644 index 0000000..f0e9478 Binary files /dev/null and b/themes/letters/static/images/favicon.ico differ diff --git a/themes/letters/templates/base.html b/themes/letters/templates/base.html index 73b3b7d..90fb5c1 100644 --- a/themes/letters/templates/base.html +++ b/themes/letters/templates/base.html @@ -10,6 +10,7 @@ {% if FEED_ALL_RSS %} {% endif %} + {% block extra_head %}{% endblock extra_head %}