github/pelican
1
0
Fork 1
mirror of https://github.com/getpelican/pelican.git synced 2025-10-15 20:28:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge d81a9ac3a5 into f9a778fcae

Browse source
This commit is contained in:
Aldo Ridhoni 2017-07-20 21:50:37 +00:00 • committed by GitHub
commit 35fbae186f
2 changed files with 27 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

36
pelican/tools/templates/Makefile.in
View file

@ -61,63 +61,63 @@ help:
@echo ' ' @echo ' '
html: html:
$$(PELICAN) $$(INPUTDIR) -o $$(OUTPUTDIR) -s $$(CONFFILE) $$(PELICANOPTS) $$(PELICAN) "$$(INPUTDIR)" -o "$$(OUTPUTDIR)" -s "$$(CONFFILE)" $$(PELICANOPTS)
clean: clean:
[ ! -d $$(OUTPUTDIR) ] || rm -rf $$(OUTPUTDIR) [ ! -d "$$(OUTPUTDIR)" ] || rm -rf "$$(OUTPUTDIR)"
regenerate: regenerate:
$$(PELICAN) -r $$(INPUTDIR) -o $$(OUTPUTDIR) -s $$(CONFFILE) $$(PELICANOPTS) $$(PELICAN) -r "$$(INPUTDIR)" -o "$$(OUTPUTDIR)" -s "$$(CONFFILE)" $$(PELICANOPTS)
serve: serve:
ifdef PORT ifdef PORT
cd $$(OUTPUTDIR) && $(PY) -m pelican.server $$(PORT) cd "$$(OUTPUTDIR)" && $(PY) -m pelican.server $$(PORT)
else else
cd $$(OUTPUTDIR) && $(PY) -m pelican.server cd "$$(OUTPUTDIR)" && $(PY) -m pelican.server
endif endif
serve-global: serve-global:
ifdef SERVER ifdef SERVER
cd $$(OUTPUTDIR) && $(PY) -m pelican.server 80 $$(SERVER) cd "$$(OUTPUTDIR)" && $(PY) -m pelican.server 80 $$(SERVER)
else else
cd $$(OUTPUTDIR) && $(PY) -m pelican.server 80 0.0.0.0 cd "$$(OUTPUTDIR)" && $(PY) -m pelican.server 80 0.0.0.0
endif endif
devserver: devserver:
ifdef PORT ifdef PORT
$$(BASEDIR)/develop_server.sh restart $$(PORT) "$$(BASEDIR)/develop_server.sh" restart $$(PORT)
else else
$$(BASEDIR)/develop_server.sh restart "$$(BASEDIR)/develop_server.sh" restart
endif endif
stopserver: stopserver:
$(BASEDIR)/develop_server.sh stop "$$(BASEDIR)/develop_server.sh" stop
@echo 'Stopped Pelican and SimpleHTTPServer processes running in background.' @echo 'Stopped Pelican and SimpleHTTPServer processes running in background.'
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
dropbox_upload: publish dropbox_upload: publish
cp -r $$(OUTPUTDIR)/* $$(DROPBOX_DIR) cp -r "$$(OUTPUTDIR)/*" "$$(DROPBOX_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"
s3_upload: publish s3_upload: publish
aws s3 sync $(OUTPUTDIR)/ s3://$(S3_BUCKET) --acl public-read --delete aws s3 sync "$(OUTPUTDIR)/" s3://$(S3_BUCKET) --acl public-read --delete
cf_upload: publish cf_upload: publish
cd $(OUTPUTDIR) && swift -v -A https://auth.api.rackspacecloud.com/v1.0 -U $(CLOUDFILES_USERNAME) -K $(CLOUDFILES_API_KEY) upload -c $(CLOUDFILES_CONTAINER) . cd "$(OUTPUTDIR)" && swift -v -A https://auth.api.rackspacecloud.com/v1.0 -U $(CLOUDFILES_USERNAME) -K $(CLOUDFILES_API_KEY) upload -c $(CLOUDFILES_CONTAINER) .
github: publish github: publish
ghp-import -m "Generate Pelican site" -b $(GITHUB_PAGES_BRANCH) $$(OUTPUTDIR) ghp-import -m "Generate Pelican site" -b $(GITHUB_PAGES_BRANCH) "$$(OUTPUTDIR)"
git push origin $(GITHUB_PAGES_BRANCH) git push origin $(GITHUB_PAGES_BRANCH)
.PHONY: html help clean regenerate serve serve-global devserver stopserver publish ssh_upload rsync_upload dropbox_upload ftp_upload s3_upload cf_upload github .PHONY: html help clean regenerate serve serve-global devserver stopserver publish ssh_upload rsync_upload dropbox_upload ftp_upload s3_upload cf_upload github

18
pelican/tools/templates/develop_server.sh.in
View file

@ -31,7 +31,7 @@ function alive() {
} }
function shut_down(){ function shut_down(){
PID=$$(cat $$SRV_PID) PID=$$(cat "$$SRV_PID")
if [[ $$? -eq 0 ]]; then if [[ $$? -eq 0 ]]; then
if alive $PID; then if alive $PID; then
echo "Stopping HTTP server" echo "Stopping HTTP server"
@ -39,12 +39,12 @@ function shut_down(){
else else
echo "Stale PID, deleting" echo "Stale PID, deleting"
fi fi
rm $$SRV_PID rm "$$SRV_PID"
else else
echo "HTTP server PIDFile not found" echo "HTTP server PIDFile not found"
fi fi
PID=$$(cat $$PELICAN_PID) PID=$$(cat "$$PELICAN_PID")
if [[ $$? -eq 0 ]]; then if [[ $$? -eq 0 ]]; then
if alive $$PID; then if alive $$PID; then
echo "Killing Pelican" echo "Killing Pelican"
@ -52,7 +52,7 @@ function shut_down(){
else else
echo "Stale PID, deleting" echo "Stale PID, deleting"
fi fi
rm $$PELICAN_PID rm "$$PELICAN_PID"
else else
echo "Pelican PIDFile not found" echo "Pelican PIDFile not found"
fi fi
@ -62,14 +62,14 @@ function start_up(){
local port=$$1 local port=$$1
echo "Starting up Pelican and HTTP server" echo "Starting up Pelican and HTTP server"
shift shift
$$PELICAN --debug --autoreload -r $$INPUTDIR -o $$OUTPUTDIR -s $$CONFFILE $$PELICANOPTS & "$$PELICAN" --debug --autoreload -r "$$INPUTDIR" -o "$$OUTPUTDIR" -s "$$CONFFILE" $$PELICANOPTS &
pelican_pid=$$! pelican_pid=$$!
echo $$pelican_pid > $$PELICAN_PID echo $$pelican_pid > "$$PELICAN_PID"
mkdir -p $$OUTPUTDIR && cd $$OUTPUTDIR mkdir -p "$$OUTPUTDIR" && cd "$$OUTPUTDIR"
$PY -m pelican.server $$port & $PY -m pelican.server $$port &
srv_pid=$$! srv_pid=$$!
echo $$srv_pid > $$SRV_PID echo $$srv_pid > "$$SRV_PID"
cd $$BASEDIR cd "$$BASEDIR"
sleep 1 sleep 1
if ! alive $$pelican_pid ; then if ! alive $$pelican_pid ; then
echo "Pelican didn't start. Is the Pelican package installed?" echo "Pelican didn't start. Is the Pelican package installed?"