aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--pelicanconf.py9
-rw-r--r--publishconf.py12
2 files changed, 14 insertions, 7 deletions
diff --git a/pelicanconf.py b/pelicanconf.py
index 1bf7701..e92521b 100644
--- a/pelicanconf.py
+++ b/pelicanconf.py
@@ -4,13 +4,15 @@ from __future__ import unicode_literals
AUTHOR = u'bnewbold'
SITENAME = u'bnewbold.net'
-SITEURL = u'https://bnewbold.net'
+SITEURL = u'http://bnewbold.net'
DEFAULT_DATE = None
OUTPUT_SOURCES = True
DEFAULT_CATEGORY = ''
OUTPUT_SOURCES_EXTENSION = '.raw'
SLUGIFY_SOURCE = 'basename'
+DISPLAY_PAGES_ON_MENU = False
+DISPLAY_CATEGORIES_ON_MENU = False
PATH = '.'
STATIC_PATHS = ['static', '.well-known']
@@ -18,6 +20,10 @@ ARTICLE_PATHS = ['posts']
PAGE_PATHS = ['pages']
PLUGIN_PATHS = ['plugins']
+EXTRA_PATH_METADATA = {
+ #'well-known/keybase.txt': {'path': '.well-known/keybase.txt'},
+ }
+
THEME = "theme"
PLUGINS = ['sitemap', 'headerid']
@@ -37,6 +43,7 @@ TIMEZONE = 'UTC'
DEFAULT_LANG = u'en'
# Feed generation is usually not desired when developing
+FEED_DOMAIN = SITEURL
FEED_ALL_ATOM = 'feeds/all.atom.xml'
CATEGORY_FEED_ATOM = 'feeds/%s.atom.xml'
FEED_ALL_RSS = 'feeds/all.rss.xml'
diff --git a/publishconf.py b/publishconf.py
index 85ff8ef..50bd158 100644
--- a/publishconf.py
+++ b/publishconf.py
@@ -10,15 +10,15 @@ import sys
sys.path.append(os.curdir)
from pelicanconf import *
-SITEURL = ''
-RELATIVE_URLS = False
-
-FEED_ALL_ATOM = 'feeds/all.atom.xml'
-CATEGORY_FEED_ATOM = 'feeds/%s.atom.xml'
+# Keep defaults from pelicanconfig.py
+#SITEURL = ''
+#RELATIVE_URLS = False
+#FEED_ALL_ATOM = 'feeds/all.atom.xml'
+#CATEGORY_FEED_ATOM = 'feeds/%s.atom.xml'
+# Do want this
DELETE_OUTPUT_DIRECTORY = True
# Following items are often useful when publishing
-
#DISQUS_SITENAME = ""
#GOOGLE_ANALYTICS = ""