From a59aab5a8c8122e13ca8482246437feac536da5b Mon Sep 17 00:00:00 2001
From: Sébastien Dailly <sebastien@chimrod.com>
Date: Wed, 1 May 2013 13:19:41 +0200
Subject: Updated publication configuration

---
 develop_server.sh | 6 +-----
 pelicanconf.py    | 3 +--
 publish.sh        | 2 +-
 publishconf.py    | 2 +-
 4 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/develop_server.sh b/develop_server.sh
index d49f866..0c40b4e 100755
--- a/develop_server.sh
+++ b/develop_server.sh
@@ -10,8 +10,6 @@ INPUTDIR=$BASEDIR/content
 OUTPUTDIR=$BASEDIR/output
 CONFFILE=$BASEDIR/pelicanconf.py
 
-DEVCONF=$BASEDIR/.pelican.py
-
 ###
 # Don't change stuff below here unless you are sure
 ###
@@ -63,10 +61,8 @@ function shut_down(){
 function start_up(){
   echo "Starting up Pelican and pelican.server"
 
-  sed -e 's|SITEURL.*|SITEURL=\"http://localhost:8000\"|' -e 's|DISQUS_SITENAME.*||' $CONFFILE > $DEVCONF
-
   shift
-  $PELICAN --debug --autoreload -r $INPUTDIR -o $OUTPUTDIR -s $DEVCONF $PELICANOPTS &
+  $PELICAN --debug --autoreload -r $INPUTDIR -o $OUTPUTDIR -s $CONFFILE $PELICANOPTS &
   pelican_pid=$!
   echo $pelican_pid > $PELICAN_PID
   cd $OUTPUTDIR
diff --git a/pelicanconf.py b/pelicanconf.py
index 68e654d..4a145e8 100755
--- a/pelicanconf.py
+++ b/pelicanconf.py
@@ -3,7 +3,7 @@
 
 AUTHOR = u'Chimrod'
 SITENAME = u'Chimrod'
-SITEURL = 'http://blog.chimrod.com'
+SITEURL = 'http://localhost:8000'
 
 TIMEZONE = 'Europe/Paris'
 
@@ -31,7 +31,6 @@ ARTICLE_URL = u'{date:%Y}/{date:%m}/{slug}/'
 ARTICLE_SAVE_AS = u'{date:%Y}/{date:%m}/{slug}/index.html'
 
 
-DISQUS_SITENAME='chimrod'
 
 THEME = 'theme'
 TYPOGRIFY = True
diff --git a/publish.sh b/publish.sh
index a11b1b6..70e03dd 100755
--- a/publish.sh
+++ b/publish.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
 source ~/.virtualenvs/pelican/bin/activate
 cd ~/pelican/blog/
-make html
+make publish
 rsync -ra --del output/ /home/www/blog-chimrod/
diff --git a/publishconf.py b/publishconf.py
index e48e0d6..77840f3 100644
--- a/publishconf.py
+++ b/publishconf.py
@@ -14,5 +14,5 @@ DELETE_OUTPUT_DIRECTORY = True
 # Uncomment following line for absolute URLs in production:
 #RELATIVE_URLS = False
 
-#DISQUS_SITENAME = ""
+DISQUS_SITENAME='chimrod'
 #GOOGLE_ANALYTICS = ""
-- 
cgit v1.2.3