aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Runge <dave@sleepmap.de>2016-04-15 10:04:56 +0200
committerDavid Runge <dave@sleepmap.de>2016-04-15 10:04:56 +0200
commit7200351dd2803b26880561c05d2dc70e672ffc92 (patch)
tree1460f35be3abb685b6dd3ce158f4f1c2efa10d13
parent435cbbee075c17b1b0b6f04eda9412ae16398f57 (diff)
parentef30c6b16cfa78a93a88ad50d25c77e778ad1bc2 (diff)
downloadsleepmap-7200351dd2803b26880561c05d2dc70e672ffc92.tar.gz
sleepmap-7200351dd2803b26880561c05d2dc70e672ffc92.tar.bz2
sleepmap-7200351dd2803b26880561c05d2dc70e672ffc92.tar.xz
sleepmap-7200351dd2803b26880561c05d2dc70e672ffc92.zip
Merge branch 'master' of sleepmap:sleepmap
* 'master' of sleepmap:sleepmap: publishconf.py: Adding SITEURL. content/cert/dave@sleepmap.de.asc: Adding updated key (additional mail address).
-rw-r--r--content/cert/dave@sleepmap.de.asc61
-rw-r--r--publishconf.py2
2 files changed, 38 insertions, 25 deletions
diff --git a/content/cert/dave@sleepmap.de.asc b/content/cert/dave@sleepmap.de.asc
index 44770e7..c62e963 100644
--- a/content/cert/dave@sleepmap.de.asc
+++ b/content/cert/dave@sleepmap.de.asc
@@ -207,28 +207,41 @@ Mn+TwIO6KTqPp3PYPVgLtOJVAngYnClAdI/fvyopCsBGMNDAmOAxKLLBp4hMzpKG
pQhr9jSulkzHaNM4G5Iw9LuKrqF2S2j4h8RWLfBocmSJBfmpBnDkLpFgLp5Fl25z
u/VWCzcTbLi+DRJVPjcsty1ot2EqG3xXdBlonT4odR2z8PazXWD2kBosmUi1xbIJ
M4jlVSUFjV+d2pA+gSTUXQggsoOQFceT68rRukGP/9A+mq9aXhhlT3BfsVbTJrxK
-uQINBE+m1eEBEADIVw5XI6cw/OuZuYmyHQYzxIZIbvmf3PCVefefog91x3bwDwzl
-dQDH+HW/bdubfEhOqMmN/sUQJwhE4IC9JDCPkKNPvXTOqPZpxHquR4gjThIsJ8T2
-RSrv09KD+Nvip6xVS83jxhgyw4JIsRfBTVBiuw/6actV2soeEfV3iOZsFhj0M+lU
-AfhvRR7MdARyqbSaeoxDql0aQrgGMB7YcqnFXeIuRaBiED663AqHzAA3OF+LSZCy
-conSgnHXdIGpAIaOyLMbBORYp7jtZHMUzyVt3PISL8S4dMTWjRy9vMbZicDrtNQu
-pDrG+kSgeghFwxiuoyMAjMYyRw3jfhWJDHWPrLmZqd11Tw8oaDBcI3Z8LLy1Qzin
-EWjWVoRPYBlPVFY+S0H+PvrWiUjrLC6d0nurarX4SkKDMRbBw7zXlQTN22WBDiGG
-DbK9es/UFAZgaoPOLF8oyV/CDs9qD9TtMTQJuAY7lg0ErOEGucLEQ6st1Fw7twAG
-Bj39l8zjnRrx2SzQDvOqzUUPBH5o1hlI0aKtxuyas35dzhS7aNpZsT5eUGMuvvYn
-X3BIvHeDiUSydVLx71xLdhcEWT/vaR7TvPOW/bMkMEO61eJASLFQSde37hLPnm3j
-m3CtEzvwoGuN2SEg5yM9alud1Y/lWbwhd+NsjvDweanqVFottHHWaZSt0wARAQAB
-iQIlBBgBAgAPBQJPptXhAhsMBQkJZgGAAAoJEFTCj0/1oalJKHoQAJ+oxFr4yXGZ
-ROKLcvizRatxl+rbjLWR5UcNbmHtah/QiFlvkjfFTZDyEtRD+pcDXdfZoQI4ohjp
-49u8F98bI0+rWsVI5HiRmHvM5nnIj5JO4EEyq8XMmX5xo5RwKb5hlYnGxnvXDmrX
-etsyebp3KOiE90ghFiHFXFpvXwJe9n4YNvWp60e4Xev0MjWAJIdntYDk2xzZUxjV
-083WjeIIAKfm0Ec+Ue5wK55huf5RbNHIOqoKasGX4jfbpg5bjFYSiGionJGmwP8T
-NR+3EjuGa4+hJ6VktpRcDf7hyNCDTHPmz4BSlT70ofWCDlyK8dcaLau3iuwEpD9c
-vNFyXBjXVniPEvMWc3Yx/ETFD5tpCrSCKOOM5trzqVBsL4lJXh+5VErv2LD9IOmd
-3O/J5HNvfrsUDZkrPisFUlvEd8iGg42kyjSRUHSWkCVxvLXwz5s2l8XaxGo+2FtJ
-Pkme/FtcFYiixvOt8QQq3bxqFtuwquRXDxvG8Ov6ywlJEYytbnrOZ9sIZSSiFjLh
-ehAzbG9QSHi29EYreQ9D/5t40WdACVojMp53Wfgzuqla91ou9ucUS9Qs1KBMnzc7
-sAfe54pVpNdR6WsmOK3ZA6MsQpg3j4kKRDOL8o/DskYKolpV0B1U5bO7M0mBCj00
-hFHqDng+bYTY3J647jSBYk6JeiRQOI+f
-=oScn
+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
+iXokUDiPnw==
+=sElg
-----END PGP PUBLIC KEY BLOCK-----
diff --git a/publishconf.py b/publishconf.py
index 85ff8ef..303b55f 100644
--- a/publishconf.py
+++ b/publishconf.py
@@ -10,7 +10,7 @@ import sys
sys.path.append(os.curdir)
from pelicanconf import *
-SITEURL = ''
+SITEURL = 'https://sleepmap.de'
RELATIVE_URLS = False
FEED_ALL_ATOM = 'feeds/all.atom.xml'