zum Commit vorgemerkte Änderungen:
geändert: src/Makefiles/Makefile.ftpUpload
This commit is contained in:
@@ -16,6 +16,17 @@ httpUrlBase = http://cwsvjudo.bplaced.net.net/
|
||||
ftpFilePath = videoalben/videoalben.2018
|
||||
ftpPathBase = /www
|
||||
|
||||
|
||||
#ftpPathBase = /htdocs
|
||||
#ftpFilePath = videoalben/videoalben.2018
|
||||
|
||||
ftpServer = cwsvjudo.bplaced.net
|
||||
ftpUser = cwsvjudo
|
||||
ftpPassword = ***REMOVED***
|
||||
|
||||
ftpPathBase = /www
|
||||
ftpFilePath = videoalben/videoalben.2018
|
||||
|
||||
vidGalIndexPhp = ~/keeper/judo/homepage/redesign2018/markdownExperiment/src/galleryTemplates/indexHier.php
|
||||
dryRun = --dry-run
|
||||
timeHandling= --only-newer
|
||||
@@ -24,14 +35,13 @@ lftpNetLimitRate = 0
|
||||
domain = cwsvJudo.dedyn.io
|
||||
vidGalInsertScript = ~/keeper/judo/homepage/redesign2018/markdownExperiment/src/galleryHelper/vidGalInsert.py
|
||||
|
||||
|
||||
.PHONY: all
|
||||
all:
|
||||
|
||||
.PHONY: ftpUpload
|
||||
ftpUpload:
|
||||
lftp -e 'set ftp:ssl-allow no; set net:limit-rate $(lftpNetLimitRate); mkdir -f $(ftpPathBase)/$(ftpFilePath)/$(VID_GAL_DIR); mkdir -f $(ftpPathBase)/$(ftpFilePath)/$(VID_GAL_DIR)/thumbnails; mkdir -f $(ftpPathBase)/$(ftpFilePath)/$(VID_GAL_DIR)/webm; put $(vidGalIndexPhp) -o $(ftpPathBase)/$(ftpFilePath)/$(VID_GAL_DIR)/index.php; put videos/config.inc.php -o $(ftpPathBase)/$(ftpFilePath)/$(VID_GAL_DIR)/config.inc.php; mirror $(dryRun) $(timeHandling) -R videos/thumbnails $(ftpPathBase)/$(ftpFilePath)/$(VID_GAL_DIR)/thumbnails; mirror $(dryRun) $(timeHandling) -R videos/webm $(ftpPathBase)/$(ftpFilePath)/$(VID_GAL_DIR)/webm; quit; ' \
|
||||
-u $(ftpUser),$(ftpPassword) ftp://$(ftpServer)
|
||||
# lftp -e 'set ftp:ssl-allow no; set net:limit-rate $(lftpNetLimitRate); mkdir -f $(ftpPathBase)/$(ftpFilePath)/$(VID_GAL_DIR); mkdir -f $(ftpPathBase)/$(ftpFilePath)/$(VID_GAL_DIR)/thumbnails; mkdir -f $(ftpPathBase)/$(ftpFilePath)/$(VID_GAL_DIR)/webm; put $(vidGalIndexPhp) -o $(ftpPathBase)/$(ftpFilePath)/$(VID_GAL_DIR)/index.php; put videos/config.inc.php -o $(ftpPathBase)/$(ftpFilePath)/$(VID_GAL_DIR)/config.inc.php; mirror $(dryRun) $(timeHandling) -R videos/thumbnails $(ftpPathBase)/$(ftpFilePath)/$(VID_GAL_DIR)/thumbnails; mirror $(dryRun) $(timeHandling) -R videos/webm $(ftpPathBase)/$(ftpFilePath)/$(VID_GAL_DIR)/webm; quit; ' \
|
||||
# -u $(ftpUser),$(ftpPassword) ftp://$(ftpServer)
|
||||
|
||||
registerFiles:
|
||||
for file in videos/webm/*; do \
|
||||
@@ -47,4 +57,15 @@ registerFiles:
|
||||
--vidUrl="http://$(domain)/webm/$${filename}" \
|
||||
--posterUrl="http://cwsvjudo-media-2018.unaux.com/$(ftpFilePath)/$(VID_GAL_DIR)/thumbnails/$${filename%.*}.jpg" \
|
||||
--checkSum=$${filename%.*}; \
|
||||
# lftp -e 'set ftp:ssl-allow no; set net:limit-rate $(lftpNetLimitRate); mkdir -f $(ftpPathBase)/$(ftpFilePath)/$(VID_GAL_DIR); mkdir -f $(ftpPathBase)/$(ftpFilePath)/$(VID_GAL_DIR)/thumbnails; mkdir -f $(ftpPathBase)/$(ftpFilePath)/$(VID_GAL_DIR)/webm; put $(vidGalIndexPhp) -o $(ftpPathBase)/$(ftpFilePath)/$(VID_GAL_DIR)/index.php; put videos/config.inc.php -o $(ftpPathBase)/$(ftpFilePath)/$(VID_GAL_DIR)/config.inc.php; mirror $(dryRun) $(timeHandling) -R videos/thumbnails $(ftpPathBase)/$(ftpFilePath)/$(VID_GAL_DIR)/thumbnails; mirror $(dryRun) $(timeHandling) -R videos/webm $(ftpPathBase)/$(ftpFilePath)/$(VID_GAL_DIR)/webm; quit; ' \
|
||||
# -u $(ftpUser),$(ftpPassword) ftp://$(ftpServer)
|
||||
|
||||
for file in videos/webm/*; do \
|
||||
filename=$${file##*/}; \
|
||||
$(vidGalInsertScript) \
|
||||
--shiaiYamlFile=./shiaiData.yaml \
|
||||
# --vidUrl="http://cwsvjudo.dedyn.io/videos/$${filename}" \
|
||||
--vidUrl="http://cwsvjudo.dedyn.io/videos/$${filename}" \
|
||||
--posterUrl="http://cwsvjudo-media-2018.unaux.com/$(ftpFilePath)/$(VID_GAL_DIR)/thumbnails/$${filename%.*}.jpg" \
|
||||
--checkSum=$${filename%.*};\
|
||||
done;\
|
||||
|
||||
Reference in New Issue
Block a user