summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWolfgang Wiedmeyer <wolfgit@wiedmeyer.de>2016-08-03 10:11:13 +0200
committerWolfgang Wiedmeyer <wolfgit@wiedmeyer.de>2016-08-03 10:11:13 +0200
commita16bb552902472178c63a26012a60cf83449345b (patch)
tree6b14e9c33b7eb7d2fb7ea4f1826e25aa69923db0
parentd30946daae89611234af2d4affd89da87b75a232 (diff)
downloadblog-a16bb552902472178c63a26012a60cf83449345b.zip
blog-a16bb552902472178c63a26012a60cf83449345b.tar.gz
blog-a16bb552902472178c63a26012a60cf83449345b.tar.bz2
contact
also add GNU Octave to links
-rw-r--r--content/pages/contact.rst12
-rw-r--r--content/pages/impressum.rst2
-rw-r--r--pelicanconf.py3
3 files changed, 15 insertions, 2 deletions
diff --git a/content/pages/contact.rst b/content/pages/contact.rst
new file mode 100644
index 0000000..2001fc6
--- /dev/null
+++ b/content/pages/contact.rst
@@ -0,0 +1,12 @@
+:title: Contact
+:status: published
+
+Feel free to send an Email to wreg@wiedmeyer.de.
+
+| Please use GPG encryption, so you don't send out digital postcards all the time. My GPG key can be found `here <./extras/gpgpub.asc>`__ or you can get it from a keyserver like hkps.pool.sks-keyservers.net. The key should have the following fingerprint: 0F30 D1A0 2F73 F70A 6FEE 048E 5816 A24C 1075 7FC4.
+| If you are new to mail encryption: `This <https://emailselfdefense.fsf.org>`__ is a very good introductory guide. If you want to go a step further and follow best practices, have a look `here <https://riseup.net/en/security/message-security/openpgp/best-practices>`__.
+
+It's pointless to send me spam, so save yourself some time and do meaningful things
+instead. I have set up quite rigorous filters and won't read your junk in any case.
+
+I'm also available via Jabber/XMPP upon request. You may additionally find me on a few of the popular IRC networks. My nick is wiewo.
diff --git a/content/pages/impressum.rst b/content/pages/impressum.rst
index c3f5eb9..c3c2c46 100644
--- a/content/pages/impressum.rst
+++ b/content/pages/impressum.rst
@@ -12,7 +12,7 @@ Wolke 7
E-Mail: wreg@wiedmeyer.de
-E-Mails bitte mit meinem PGP-Schlüssel verschlüsseln. Der Schlüssel kann `hier <./extras/gpgpub.asc>`_ oder von einem Keyserver wie hkps.pool.sks-keyservers.net heruntergeladen werden.
+E-Mails bitte mit meinem PGP-Schlüssel verschlüsseln. Der Schlüssel kann `hier <./extras/gpgpub.asc>`_ oder von einem Keyserver wie hkps.pool.sks-keyservers.net heruntergeladen werden. Mehr dazu unter `Contact <./contact.html>`_.
Datenschutzerklärung
diff --git a/pelicanconf.py b/pelicanconf.py
index 792d69c..869d24a 100644
--- a/pelicanconf.py
+++ b/pelicanconf.py
@@ -70,7 +70,8 @@ DISPLAY_TAGS_ON_SIDEBAR = False
LINKS = (('Debian', 'https://www.debian.org/'),
('Replicant', 'https://www.replicant.us/'),
('Libreboot', 'https://libreboot.org/'),
- ('F-Droid', 'https://f-droid.org/'),)
+ ('F-Droid', 'https://f-droid.org/'),
+ ('GNU Octave', 'https://www.gnu.org/software/octave/'),)
# Social widget
# SOCIAL = (('You can add links in your config file', '#'),