Test PR #1

Merged
bpoldrack merged 1 commit from test-pr into master 2025-08-19 08:44:08 +00:00
2 changed files with 13 additions and 12 deletions

View file

@ -1,17 +1,18 @@
PY?=python PY?=python
PELICAN?=pelican PELICAN?=pelican
PELICANOPTS= PELICANOPTS=--fatal errors
BASEDIR=$(CURDIR) BASEDIR=$(CURDIR)
INPUTDIR=$(BASEDIR)/content INPUTDIR=$(BASEDIR)/content
OUTPUTDIR=$(BASEDIR)/output OUTPUTDIR=$(BASEDIR)/docs
CONFFILE=$(BASEDIR)/pelicanconf.py CONFFILE=$(BASEDIR)/pelicanconf.py
PUBLISHCONF=$(BASEDIR)/publishconf.py PUBLISHCONF=$(BASEDIR)/publishconf.py
SSH_HOST=kumo.ovgu.de # This is invalid ATM:
SSH_PORT=22 # SSH_HOST=kumo.ovgu.de
SSH_USER= # SSH_PORT=22
SSH_TARGET_DIR=/var/www/docs.cbbs.eu/www # SSH_USER=
# SSH_TARGET_DIR=/var/www/docs.cbbs.eu/www
DEBUG ?= 0 DEBUG ?= 0
ifeq ($(DEBUG), 1) ifeq ($(DEBUG), 1)
@ -61,10 +62,10 @@ stopserver:
publish: publish:
$(PELICAN) $(INPUTDIR) -o $(OUTPUTDIR) -s $(PUBLISHCONF) $(PELICANOPTS) $(PELICAN) $(INPUTDIR) -o $(OUTPUTDIR) -s $(PUBLISHCONF) $(PELICANOPTS)
ssh_upload: publish #ssh_upload: publish
scp -P $(SSH_PORT) -r $(OUTPUTDIR)/* $(SSH_USER)@$(SSH_HOST):$(SSH_TARGET_DIR) # scp -P $(SSH_PORT) -r $(OUTPUTDIR)/* $(SSH_USER)@$(SSH_HOST):$(SSH_TARGET_DIR)
rsync_upload: publish #rsync_upload: publish
rsync -e "ssh -p $(SSH_PORT)" -P -rvzc --delete $(OUTPUTDIR)/ $(SSH_USER)@$(SSH_HOST):$(SSH_TARGET_DIR) --cvs-exclude # rsync -e "ssh -p $(SSH_PORT)" -P -rvzc --delete $(OUTPUTDIR)/ $(SSH_USER)@$(SSH_HOST):$(SSH_TARGET_DIR) --cvs-exclude
.PHONY: html help clean devserver stopserver publish ssh_upload rsync_upload .PHONY: html help clean devserver stopserver publish

View file

@ -8,7 +8,7 @@ PELICANOPTS=
BASEDIR=$(pwd) BASEDIR=$(pwd)
INPUTDIR=$BASEDIR/content INPUTDIR=$BASEDIR/content
OUTPUTDIR=$BASEDIR/output OUTPUTDIR=$BASEDIR/docs
CONFFILE=$BASEDIR/pelicanconf.py CONFFILE=$BASEDIR/pelicanconf.py
### ###