pelicanconf.py: Sorting configuration. Adding PATH_METADATA for pages to be top-level.

1 files changed, 26 insertions, 38 deletions

diff --git a/pelicanconf.py b/pelicanconf.py
index 7e9332a..4ee7234 100644
--- a/pelicanconf.py
+++ b/pelicanconf.py
@@ -2,50 +2,38 @@
 # -*- coding: utf-8 -*- #
 from __future__ import unicode_literals
 
-
-
-AUTHOR = 'David Runge'
 ARTICLE_PATHS = ['blog']
 ARTICLE_SAVE_AS = '{date:%Y}/{slug}.html'
 ARTICLE_URL = '{date:%Y}/{slug}.html'
-SITENAME = 'Sleep Map'
-SITEURL = 'http://sleepmap.de'
-
-
-PATH = 'content'
-
-TIMEZONE = 'Europe/Berlin'
-
-DEFAULT_LANG = 'en'
-
-# Feed generation is usually not desired when developing
-FEED_ALL_ATOM = None
-CATEGORY_FEED_ATOM = None
-TRANSLATION_FEED_ATOM = None
+AUTHOR = 'David Runge'
 AUTHOR_FEED_ATOM = None
 AUTHOR_FEED_RSS = None
-
-# Blogroll
-LINKS = (('Arch Linux', 'https://archlinux.org'),
-         ('NetworkSEC', 'http://networksec.de'),
-         ('Freakquenzy Records e.V.', 'http://frqrec.de'),
-         ('Waldeck-Freakquenz', 'http://waldeck-freakquenz.de'),
-         )
-
-# Social widget
-SOCIAL = (('Twitter', 'https://twitter.com/dvzrv'),
-          ('Github', 'https://github.com/dvzrv'),
-          )
-
+CATEGORY_FEED_ATOM = None
+DEFAULT_LANG = 'en'
 DEFAULT_PAGINATION = 30
-
-THEME = 'sleepmap-theme'
+FEED_ALL_ATOM = None
+# Blogroll
+LINKS = (
+            ('Arch Linux', 'https://archlinux.org'),
+            ('NetworkSEC', 'http://networksec.de'),
+            ('Freakquenzy Records e.V.', 'http://frqrec.de'),
+            ('Waldeck-Freakquenz', 'http://waldeck-freakquenz.de'),
+)
+PATH = 'content'
+PATH_METADATA = 'pages/(?P<path>.*)\..*' # Make pages top-level (remove /pages/ from each URL)
+# Plugins
+PLUGIN_PATHS = ['../pelican-plugins/']
+PLUGINS = ['pelican-page-hierarchy']
 # Uncomment following line if you want document-relative URLs when developing
 RELATIVE_URLS = True
-
+SITENAME = 'Sleep Map'
+SITEURL = 'http://sleepmap.de'
+# Social widget
+SOCIAL = (
+            ('Twitter', 'https://twitter.com/dvzrv'),
+            ('Github', 'https://github.com/dvzrv'),
+)
 STATIC_PATHS = [ 'downloads', 'icons', 'images', 'music' ]
-
-USE_FOLDER_AS_CATEGORY = False
-
-PLUGIN_PATHS = ['../pelican/plugins/']
-PLUGINS = ['pelican-page-hierarchy']
+THEME = 'sleepmap-theme'
+TIMEZONE = 'Europe/Berlin'
+TRANSLATION_FEED_ATOM = None