diff --git a/Makefile.example b/Makefile.example index ea15fd3..9fff851 100644 --- a/Makefile.example +++ b/Makefile.example @@ -8,6 +8,9 @@ OUTPUTDIR=$(BASEDIR)/output CONFFILE=$(BASEDIR)/pelicanconf.py PUBLISHCONF=$(BASEDIR)/publishconf.py +ONIONCONF=$(BASEDIR)/onionconf.py +FILE_EXCLUDE='.htaccess' + FTP_HOST=******** FTP_USER=******** FTP_TARGET_DIR=******** @@ -17,6 +20,11 @@ SSH_PORT=22 SSH_USER=root SSH_TARGET_DIR=/var/www +ONION_SSH_HOST=localhost +ONION_SSH_PORT=22 +ONION_SSH_USER=root +ONION_SSH_TARGET_DIR=/var/www + DEBUG ?= 0 ifeq ($(DEBUG), 1) PELICANOPTS += -D @@ -40,6 +48,7 @@ help: @echo ' make devserver [PORT=8000] serve and regenerate together ' @echo ' make ssh_upload upload the web site via SSH ' @echo ' make rsync_upload upload the web site via rsync+ssh ' + @echo ' make onion_rsync_upload upload the web site onion via rsync+ssh ' @echo ' make ftp_upload upload the web site via FTP ' @echo ' make validate validate the web site via html5validator' @echo ' ' @@ -82,6 +91,11 @@ endif publishconf: $(PELICAN) $(INPUTDIR) -o $(OUTPUTDIR) -s $(PUBLISHCONF) $(PELICANOPTS) +onionconf: + $(PELICAN) $(INPUTDIR) -o $(OUTPUTDIR) -s $(ONIONCONF) $(PELICANOPTS) + +onion_publish: onionconf + publish: publishconf ssh_upload: publish @@ -90,6 +104,9 @@ ssh_upload: publish rsync_upload: publish rsync -e "ssh -p $(SSH_PORT)" -P -rvzc --delete $(OUTPUTDIR)/ $(SSH_USER)@$(SSH_HOST):$(SSH_TARGET_DIR) +onion_rsync_upload: onion_publish + rsync --exclude $(FILE_EXCLUDE) -e "ssh -p $(ONION_SSH_PORT)" -P -rvzc --delete $(OUTPUTDIR)/ $(ONION_SSH_USER)@$(ONION_SSH_HOST):$(ONION_SSH_TARGET_DIR) + ftp_upload: publish lftp ftp://$(FTP_USER)@$(FTP_HOST) -e "mirror -R $(OUTPUTDIR) $(FTP_TARGET_DIR) ; quit" diff --git a/onionconf.py b/onionconf.py new file mode 100644 index 0000000..420fcac --- /dev/null +++ b/onionconf.py @@ -0,0 +1,21 @@ +#!/usr/bin/env python +# -*- coding: utf-8 -*- # +from __future__ import unicode_literals + +# This file is only used if you use `make publish` or +# explicitly specify it as your config file. + +import os +import sys +sys.path.append(os.curdir) +from pelicanconf import * + +PLUGINS.append('compressor') + +FEED_ALL_ATOM = 'feeds/all.atom.xml' +TRANSLATION_FEED_ATOM = 'feeds/all-{lang}.atom.xml' +CATEGORY_FEED_ATOM = 'feeds/{slug}.atom.xml' + +DELETE_OUTPUT_DIRECTORY = True + +LANGS = ['de', 'en', 'es', 'eo']