From 7dbb071934bf763fe27af605861bae5c411e6512 Mon Sep 17 00:00:00 2001 From: makefu Date: Thu, 28 Sep 2017 15:03:57 +0200 Subject: update makefile --- Makefile | 8 ++++---- pelicanconf.py | 28 +++++++++++++++++++++++----- 2 files changed, 27 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index 9785de3..c0643cb 100644 --- a/Makefile +++ b/Makefile @@ -12,10 +12,10 @@ FTP_HOST=syntax-fehler.de FTP_USER=syntax-fehler FTP_TARGET_DIR=httpdocs -SSH_HOST=pigstarter.krebsco.de +SSH_HOST=euer.krebsco.de SSH_PORT=22 -SSH_USER=makefu -SSH_TARGET_DIR=/var/www/euer.krebsco.de +SSH_USER=root +SSH_TARGET_DIR=/var/www/blog.euer S3_BUCKET=my_s3_bucket @@ -52,7 +52,7 @@ help: @echo 'Set the DEBUG variable to 1 to enable debugging, e.g. make DEBUG=1 html' @echo ' ' -html: +html: clean $(PELICAN) $(INPUTDIR) -o $(OUTPUTDIR) -s $(CONFFILE) $(PELICANOPTS) clean: diff --git a/pelicanconf.py b/pelicanconf.py index b62b65b..c8eee83 100644 --- a/pelicanconf.py +++ b/pelicanconf.py @@ -15,13 +15,12 @@ DEFAULT_LANG = 'en' FEED_ALL_ATOM = 'atom.xml' CATEGORY_FEED_ATOM = None TRANSLATION_FEED_ATOM = None -STATIC_PATHS = ['extra/robots.txt', - 'wiki/knowledge_base.html', - 'wiki/knowledge_base.xml', ] +STATIC_PATHS = ['extra/robots.txt','extra','img','extra/reghack/index.html' ] EXTRA_PATH_METADATA = { 'extra/robots.txt': {'path': 'robots.txt'}, } # Blogroll LINKS = (('exco\'s blog', 'http://excogitation.de'), + ('NixOS Wiki', 'https://nixos.wiki'), ('Binaergewitter', 'http://krepel.us'),) # Social widget @@ -35,5 +34,24 @@ PIWIK_SITE_ID=1 # Uncomment following line if you want document-relative URLs when developing RELATIVE_URLS = True -MENUITEMS = ( ( 'Wiki', '/wiki/knowledge_base.html'), - ( 'Graphs', '/graphs/retiolum/'),( 'RSS', '/atom.xml',),) +MENUITEMS = ( ( 'Wiki', 'http://wiki.euer.krebsco.de/makefu.html'), + ( 'Graphs', 'http://graph.krebsco.de'),( 'RSS', '/atom.xml',),) + +READERS = {"html": None} + +PLUGIN_PATHS = ['plugins',] +PLUGINS=['sitemap',] + +SITEMAP = { + 'format': 'xml', + 'priorities': { + 'articles': 0.5, + 'indexes': 0.5, + 'pages': 0.5 + }, + 'changefreqs': { + 'articles': 'monthly', + 'indexes': 'daily', + 'pages': 'monthly' + } +} -- cgit v1.2.3