Merge branch 'redesign2018' of /media/sdb1/gitRepositories/judo into redesign2018
Conflicts: homepage/redesign2018/markdownExperiment/src/Makefiles/Makefile.ftpUpload homepage/redesign2018/markdownExperiment/src/galleryHelper/videoGallery.tmpl.php
This commit is contained in:
@@ -1,27 +1,27 @@
|
||||
# Upload der Videogalleriedateien auf einen Webspace und Eintragen in
|
||||
# die "Videodatenbank"
|
||||
|
||||
include Makefile.cfg
|
||||
|
||||
#ftpServer = ftpupload.net
|
||||
#ftpUser = unaux_22935783
|
||||
#ftpPassword = eeloor0D
|
||||
|
||||
#ftpPathBase = /htdocs
|
||||
#ftpFilePath = videoalben/videoalben.2018
|
||||
#httpUrlBase = http://cwsvjudo-media-2018.unaux.com/
|
||||
|
||||
ftpServer = cwsvjudo.bplaced.net
|
||||
ftpUser = cwsvjudo
|
||||
ftpPassword = ***REMOVED***
|
||||
httpUrlBase = http://cwsvjudo.bplaced.net.net/
|
||||
|
||||
ftpPathBase = /www
|
||||
ftpFilePath = videoalben/videoalben.2018
|
||||
ftpPathBase = /www
|
||||
|
||||
vidGalIndexPhp = ~/keeper/judo/homepage/redesign2018/markdownExperiment/src/galleryTemplates/indexHier.php
|
||||
dryRun = --dry-run
|
||||
timeHandling= --only-newer
|
||||
lftpNetLimitRate = 0
|
||||
|
||||
|
||||
domain = cwsvJudo.dedyn.io
|
||||
|
||||
vidGalInsertScript = ~/keeper/judo/homepage/redesign2018/markdownExperiment/src/galleryHelper/vidGalInsert.py
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user