reactivation in gh-pages branch

.gitignore

@@ -2,5 +2,4 @@
 *.pyc
 *.swp
 output/
-themes/
-pelican-octopress-theme/
+__pycache__/

Makefile

@@ -112,7 +112,7 @@ ftp_upload: publish
 	lftp ftp://$(FTP_USER)@$(FTP_HOST) -e "mirror -R $(OUTPUTDIR) $(FTP_TARGET_DIR) ; quit"
 
 s3_upload: publish
-	s3cmd sync $(OUTPUTDIR)/ s3://$(S3_BUCKET) --acl-public --delete-removed --guess-mime-type
+	s3cmd sync $(OUTPUTDIR)/ s3://$(S3_BUCKET) --acl-public --delete-removed --guess-mime-type --no-mime-magic --no-preserve
 
 cf_upload: publish
 	cd $(OUTPUTDIR) && swift -v -A https://auth.api.rackspacecloud.com/v1.0 -U $(CLOUDFILES_USERNAME) -K $(CLOUDFILES_API_KEY) upload -c $(CLOUDFILES_CONTAINER) .
@@ -121,4 +121,4 @@ github: publish
 	ghp-import -m "Generate Pelican site" -b $(GITHUB_PAGES_BRANCH) $(OUTPUTDIR)
 	git push origin $(GITHUB_PAGES_BRANCH)
 
-.PHONY: html help clean regenerate serve serve-global devserver publish ssh_upload rsync_upload dropbox_upload ftp_upload s3_upload cf_upload github
+.PHONY: html help clean regenerate serve serve-global devserver stopserver publish ssh_upload rsync_upload dropbox_upload ftp_upload s3_upload cf_upload github

develop_server.sh

@@ -66,7 +66,7 @@ function start_up(){
   $PELICAN --debug --autoreload -r $INPUTDIR -o $OUTPUTDIR -s $CONFFILE $PELICANOPTS &
   pelican_pid=$!
   echo $pelican_pid > $PELICAN_PID
-  cd $OUTPUTDIR
+  mkdir -p $OUTPUTDIR && cd $OUTPUTDIR
   $PY -m pelican.server $port &
   srv_pid=$!
   echo $srv_pid > $SRV_PID

fabfile.py

@@ -37,9 +37,8 @@ def build():
     local('pelican -s pelicanconf.py')
 
 def rebuild():
-    """`clean` then `build`"""
-    clean()
-    build()
+    """`build` with the delete switch"""
+    local('pelican -d -s pelicanconf.py')
 
 def regenerate():
     """Automatically regenerate site upon file modification"""
@@ -90,5 +89,4 @@ def publish():
 def gh_pages():
     """Publish to GitHub Pages"""
     rebuild()
-    local("ghp-import -b {github_pages_branch} {deploy_path}".format(**env))
-    local("git push origin {github_pages_branch}".format(**env))
+    local("ghp-import -b {github_pages_branch} {deploy_path} -p".format(**env))

pelicanconf.py

@@ -3,20 +3,14 @@
 from __future__ import unicode_literals
 
 AUTHOR = 'daniele arosio'
-SITENAME = 'food protocols'
+SITENAME = 'Food protocols'
 SITEURL = ''
 
 PATH = 'content'
 
 TIMEZONE = 'Europe/Paris'
 
-DEFAULT_LANG = 'en'
-
-# THEME
-THEME = '../pelican-octopress-theme/'
-# THEME = 'themes/w3-personal-blog'
-
-# THEME = 'themes/svbhack'
+DEFAULT_LANG = 'it'
 
 # Feed generation is usually not desired when developing
 FEED_ALL_ATOM = None
@@ -39,5 +33,3 @@
 
 # Uncomment following line if you want document-relative URLs when developing
 #RELATIVE_URLS = True
-
-

publishconf.py

@@ -10,7 +10,7 @@
 sys.path.append(os.curdir)
 from pelicanconf import *
 
-SITEURL = 'http://darosio.github.com/foodprotocols'
+SITEURL = 'https://darosio.github.io/foodprotocols'
 RELATIVE_URLS = False
 
 FEED_ALL_ATOM = 'feeds/all.atom.xml'