summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile7
-rw-r--r--pelicanconf.py13
-rw-r--r--publishconf.py5
3 files changed, 17 insertions, 8 deletions
diff --git a/Makefile b/Makefile
index d3a2532..7dbc07c 100644
--- a/Makefile
+++ b/Makefile
@@ -12,10 +12,10 @@ FTP_HOST=localhost
FTP_USER=anonymous
FTP_TARGET_DIR=/
-SSH_HOST=localhost
+SSH_HOST=fossencdi.org
SSH_PORT=22
-SSH_USER=root
-SSH_TARGET_DIR=/var/www
+SSH_USER=mfweb
+SSH_TARGET_DIR=/var/www/blog
S3_BUCKET=my_s3_bucket
@@ -97,6 +97,7 @@ stopserver:
@echo 'Stopped Pelican and SimpleHTTPServer processes running in background.'
publish:
+ @echo 'Is the Impressum correct?'
$(PELICAN) $(INPUTDIR) -o $(OUTPUTDIR) -s $(PUBLISHCONF) $(PELICANOPTS)
ssh_upload: publish
diff --git a/pelicanconf.py b/pelicanconf.py
index 6f1d796..3caf2f3 100644
--- a/pelicanconf.py
+++ b/pelicanconf.py
@@ -7,6 +7,7 @@ SITENAME = u"Wolfi's blog"
SITEURL = ''
PATH = 'content'
+THEME = 'pelican-themes/pelican-bootstrap3'
TIMEZONE = 'Europe/Berlin'
@@ -19,6 +20,18 @@ TRANSLATION_FEED_ATOM = None
AUTHOR_FEED_ATOM = None
AUTHOR_FEED_RSS = None
+EXTRA_PATH_METADATA = {
+ 'extras/robots.txt': {'path': 'robots.txt'},
+}
+
+# only publish, if status is published
+DEFAULT_METADATA = {
+ 'status': 'draft',
+}
+
+SHOW_ARTICLE_AUTHOR = True
+SHOW_DATE_MODIFIED = True
+
# Blogroll
LINKS = (('Pelican', 'http://getpelican.com/'),
('Python.org', 'http://python.org/'),
diff --git a/publishconf.py b/publishconf.py
index d57140a..745827c 100644
--- a/publishconf.py
+++ b/publishconf.py
@@ -17,8 +17,3 @@ FEED_ALL_ATOM = 'feeds/all.atom.xml'
CATEGORY_FEED_ATOM = 'feeds/%s.atom.xml'
DELETE_OUTPUT_DIRECTORY = True
-
-# Following items are often useful when publishing
-
-#DISQUS_SITENAME = ""
-#GOOGLE_ANALYTICS = ""