diff --git a/Makefile b/Makefile index aa3f712..1ded3c9 100644 --- a/Makefile +++ b/Makefile @@ -2,6 +2,8 @@ PY?=python3 PELICAN?=pelican PELICANOPTS= +YEARSUBFOLDER=enseignements/2019-2020/ + BASEDIR=$(CURDIR) INPUTDIR=$(BASEDIR)/content OUTPUTDIR=$(BASEDIR)/output @@ -15,17 +17,7 @@ FTP_TARGET_DIR=/ SSH_HOST=localhost SSH_CONF=Embrevade #SSH_TARGET_DIR=/var/docker/opytex.org/www/ -SSH_TARGET_DIR=/home/sshcontent/opytex.org/www/ - -S3_BUCKET=my_s3_bucket - -CLOUDFILES_USERNAME=my_rackspace_username -CLOUDFILES_API_KEY=my_rackspace_api_key -CLOUDFILES_CONTAINER=my_cloudfiles_container - -DROPBOX_DIR=~/Dropbox/Public/ - -GITHUB_PAGES_BRANCH=gh-pages +SSH_TARGET_DIR=/home/sshcontent/opytex.org/www/$(YEARSUBFOLDER) SRC_ENS=~/Cours/Prof/Enseignements/ SRC_EXCLUDE=--exclude '*/Archive' --exclude '*/tools' --exclude '.git' --exclude '.gitignore' --exclude '*/__pycache__' --exclude '*/config.py' --exclude '*/reflections' --exclude '*/Notes' --exclude '*/notes' --exclude '*/.*' --exclude '*/Makefile' --exclude '2012-2013' --exclude '2013-2014' --exclude '2014-2015' --exclude 'Clipart' --exclude "Shombos" --exclude '*/venv' --exclude "*/.venv" @@ -94,10 +86,4 @@ ssh_upload: publish rsync_upload: publish rsync -e "ssh" -P -rvzc --delete --exclude "pymath" --exclude "opytex" $(OUTPUTDIR)/ $(SSH_CONF):$(SSH_TARGET_DIR) --cvs-exclude -#import_year: -# rsync -rv --delete $(SRC_EXCLUDE) --delete-excluded --include '*/' --include '*' --prune-empty-dirs $(SRC_ENS)/Archive/$$year/ $(INPUTDIR)/Enseignements/$$year - -import_ens: - rsync -av --delete $(SRC_EXCLUDE) --delete-excluded --include '*/' --include '*' --prune-empty-dirs $(SRC_ENS) $(INPUTDIR)/Enseignements/ - .PHONY: html help clean regenerate serve devserver publish ssh_upload rsync_upload dropbox_upload ftp_upload s3_upload cf_upload github import_ens