Add onion configuration

This commit is contained in:
Jesús 2020-08-09 10:17:09 -05:00
parent 922f3bc420
commit 90ec475b00
No known key found for this signature in database
GPG Key ID: F6EE7BC59A315766
2 changed files with 38 additions and 0 deletions

View File

@ -8,6 +8,9 @@ OUTPUTDIR=$(BASEDIR)/output
CONFFILE=$(BASEDIR)/pelicanconf.py CONFFILE=$(BASEDIR)/pelicanconf.py
PUBLISHCONF=$(BASEDIR)/publishconf.py PUBLISHCONF=$(BASEDIR)/publishconf.py
ONIONCONF=$(BASEDIR)/onionconf.py
FILE_EXCLUDE='.htaccess'
FTP_HOST=******** FTP_HOST=********
FTP_USER=******** FTP_USER=********
FTP_TARGET_DIR=******** FTP_TARGET_DIR=********
@ -17,6 +20,11 @@ SSH_PORT=22
SSH_USER=root SSH_USER=root
SSH_TARGET_DIR=/var/www 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 DEBUG ?= 0
ifeq ($(DEBUG), 1) ifeq ($(DEBUG), 1)
PELICANOPTS += -D PELICANOPTS += -D
@ -40,6 +48,7 @@ help:
@echo ' make devserver [PORT=8000] serve and regenerate together ' @echo ' make devserver [PORT=8000] serve and regenerate together '
@echo ' make ssh_upload upload the web site via SSH ' @echo ' make ssh_upload upload the web site via SSH '
@echo ' make rsync_upload upload the web site via rsync+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 ftp_upload upload the web site via FTP '
@echo ' make validate validate the web site via html5validator' @echo ' make validate validate the web site via html5validator'
@echo ' ' @echo ' '
@ -82,6 +91,11 @@ endif
publishconf: publishconf:
$(PELICAN) $(INPUTDIR) -o $(OUTPUTDIR) -s $(PUBLISHCONF) $(PELICANOPTS) $(PELICAN) $(INPUTDIR) -o $(OUTPUTDIR) -s $(PUBLISHCONF) $(PELICANOPTS)
onionconf:
$(PELICAN) $(INPUTDIR) -o $(OUTPUTDIR) -s $(ONIONCONF) $(PELICANOPTS)
onion_publish: onionconf
publish: publishconf publish: publishconf
ssh_upload: publish ssh_upload: publish
@ -90,6 +104,9 @@ ssh_upload: publish
rsync_upload: publish rsync_upload: publish
rsync -e "ssh -p $(SSH_PORT)" -P -rvzc --delete $(OUTPUTDIR)/ $(SSH_USER)@$(SSH_HOST):$(SSH_TARGET_DIR) 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 ftp_upload: publish
lftp ftp://$(FTP_USER)@$(FTP_HOST) -e "mirror -R $(OUTPUTDIR) $(FTP_TARGET_DIR) ; quit" lftp ftp://$(FTP_USER)@$(FTP_HOST) -e "mirror -R $(OUTPUTDIR) $(FTP_TARGET_DIR) ; quit"

21
onionconf.py Normal file
View File

@ -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']