1
0
Fork 0
forked from github/pelican
Commit graph

34 commits

Author SHA1 Message Date
Jonathan Sundqvist
77ebd05fce Actually stopping server
When running `make devserver` and then running `make stopserver` it doesn't stop the server. This patch fixes that.
2015-05-24 16:59:23 +01:00
winlu
a62f9ab23c add argparse argument for relative urls 2015-01-17 17:09:32 +01:00
Danny Hermes
3d8ceb1c67 Adding ability to listen on addresses other than localhost.
This is helpful for mobile testing of Pelican sites by allowing
broadcasting on the local network. Using port 80 requires
running as root on most machines.
2015-01-10 15:40:54 -08:00
Olivier Verdier
5b389d6f36 fix missing tab in Makefile template 2014-10-20 15:22:11 +02:00
Giulia Vergottini
5eaf2aa2bf update make github commit message 2014-06-29 17:24:47 +02:00
Giulia Vergottini
95e170a15f prettify github make commit message 2014-06-29 17:01:54 +02:00
Ondrej Grover
b0e388747c Fix #1277 use rsync -c option as all output is rewritten
Because Pelican always rewrites all output, the mtimes always change, so
rsync would always transfer all the files which defeats the purpose of
rsync. The '-c' option (--checksum) compares the checksums rather than
mtimes.
2014-04-28 22:12:14 +02:00
Federico Ceratto
5b4381c19c Add s3cmd MIME type detection 2014-04-15 10:31:07 -04:00
Justin Mayer
a9d1fdae3d PY and PELICAN env variable overrides for Make
This allows the user to set PY and/or PELICAN environment variable
overrides, which will be respected by the Makefile and devserver.sh.
If, for example, the default Python on your system were Python 3 and
you wanted to run Make with Python 2, using bash you could run
`PY=python2 make`. Refs #915.
2014-02-08 14:32:58 -08:00
Jamie Culpon
c495502c8f Support publishing to personal pages sites in quickstart
Previously pelican-quickstart would assume that the site it created for GitHub
Pages should be published to the gh-pages branch. This is correct for project
pages, but not correct for personal pages. Personal pages, which live in a
user's special username.github.io repository, are instead deployed to the
master branch. This means that if you did pelican-quickstart and tried to
publish your new personal site with make github you'd see nothing (or whatever
old pages site you had floating around in master).

ghp-import already supports publishing to different branches, so publishing
to the correct branch is just a matter of correct configuration and updating
the Makefile to pass the branch along to ghp-import. pelican-quickstart now
asks if the user wants to publish to GitHub Pages, and if so, asks if this
is a personal page and chooses the correct branch appropriately. I preferred
this approach to prompting for an arbitrary branch because I felt that
choosing the branch would feel more intimidating to someone using
pelican-quickstart for the first time.

This essentially ports changes I made to my personal pages site at
jculpon@82cae477a9e8712b90654f6432464369ebcc7ae5
2013-12-06 17:39:51 -08:00
Justin Mayer
8d352d9a78 Correct upload targets in Makefile.in 2013-08-29 17:35:48 -07:00
Nicholas Kuechler
6b68d94079 Adds Rackspace Cloud Files support to quickstart and fabfile 2013-08-05 23:30:31 -05:00
Justin Mayer
2a53934834 Merge pull request #950 from fbs/makedebug
Add a debug target to the template makefile
2013-08-03 16:51:23 -07:00
Stefan hr Berder
689632835e add port option to Makefile target serve/devserver 2013-07-07 14:28:31 +02:00
bas smit
0d63b4520a Add info about debugging to the help output of the makefile 2013-06-26 14:01:01 +02:00
bas smit
12fd53c27e Add debug target to the template makefile
If the DEBUG variable is set (e.g. DEBUG=1 make target) debugging will
be enabled by using pelicans -D flag.
2013-06-26 14:00:45 +02:00
Justin Mayer
bf0a50880d Revert "make clean" behavior to rm -rf. Fixes #773
The change to the "make clean" task in 764a2cf from "rm -rf" to instead
relying on GNU "find" appears to have broken cross-platform portability,
likely causing problems on *BSD and other platforms. This commit reverts
that change back to the previous "rm -rf" behavior.
2013-06-24 13:40:32 -07:00
Justin Mayer
e9fec3b1dc Remove "clean" task from "make html"; fixes #637
This change removes the "clean" task from the "html" and "regenerate"
tasks in the default Makefile generated by pelican-quickstart. The
previous behavior ignored whether the DELETE_OUTPUT_DIRECTORY
setting was set to True or not and deleted everything in the output
directory every time the "make html" or "make regenerate" task was run.
In addition to violating the Principle of Least Astonishment, there was
also the potential for data loss if the user wasn't careful when
defining the output directory location in the Makefile.

The new behavior therefore relies primarily on the
DELETE_OUTPUT_DIRECTORY setting to control if and when the output
directory is cleaned. The default settings and Makefile generated by the
pelican-quickstart command, for example, no longer clean the output
directory when the "make html" task is run. If the user wants to change
this behavior and have the output directory cleaned on every "make html"
run, the recommended method would be to set DELETE_OUTPUT_DIRECTORY to
True in pelicanconf.py. Alternatively, the user can manually run "make
clean", with the caveat that the output directory and its contents will
be entirely destroyed, including any otherwise to-be-retained files or
folders specified in the OUTPUT_RETENTION setting. It is for that reason
that relying on the DELETE_OUTPUT_DIRECTORY setting is instead
recommended.

As before, DELETE_OUTPUT_DIRECTORY is set to True in the publishconf.py
settings file generated by the pelican-quickstart script. This way, any
potentially old and irrelevant files will be automatically removed
before the latest version of the site is transferred to the production
server environment.

In summary, this change allows for the sanest possible default settings,
while still allowing end users to customize output cleaning to their
preferred behavior with a minimum of confusion.
2013-06-24 13:05:00 -07:00
Justin Mayer
6db2ad2130 Remove "Done" after running "make html"
Pelican now provides better user feedback (see #857), so echoing "Done"
after a "make html" run has become redundant.
2013-04-23 07:32:42 -07:00
Chenguang Wang
5e4622b229 make pelican-quickstart and the Makefile it generates support py3k. 2013-03-23 19:37:02 -07:00
lexual
62ab60d0b1 Added S3 support for pelican quickstart. 2013-03-15 15:04:33 +11:00
Thomas Thurman
372e8c07cf Fixed the stopserver command to use the correct Makefile syntax 2013-03-09 21:27:19 +00:00
Richard Duivenvoorde
a13e31a76b adding a stopsever target for make 2013-03-03 21:45:08 -08:00
Richard Duivenvoorde
824edb8823 rsync additions
- adding / otherwise you will endup with output on remote
- adding --cvs-exclude (to not sync cvs stuff)
2013-03-03 21:45:08 -08:00
John Kristensen
4e4080c523 Check output directory exists before doing a clean
- if the output directory does not exist the 'make clean' command fails,
   which also means that the 'make html' command which would otherwise
   create the output directory also fails without generating the output
2013-03-03 21:21:05 -08:00
Dirk Makowski
71995d5e1b Port pelican to python 3.
Stays compatible with 2.x series, thanks to an unified codebase.
2013-01-11 03:20:09 +01:00
Rémy HUBSCHER
61fe02f411 fix-pelican-rsync_upload-makefile 2012-10-12 23:01:50 +02:00
Justin Mayer
000210d875 Improve devserver durability. Refs #473.
Three changes:

1. Fix inconsistent "pwd" behavior by using make's $(CURDIR) builtin.
2. Change bash shebang to the more-portable form.
3. Tell users when Pelican and SimpleHTTPServer have been backgrounded.
2012-08-27 13:09:25 -07:00
tBunnyMan
62f190d574 use lowercase pwd since only Mac OS X allows uppercase commands
Fix #473
2012-08-23 07:58:39 -07:00
Justin Mayer
0c02536605 Give devserver its own make target
Restore "make serve" to a non-backgrounded SimpleHTTPServer process and
give the develop_server.sh its own make target at "make devserver".
Add a few missing make targets to the help list and re-order targets for
consistency. Add note to docs regarding how to stop the devserver.
2012-08-05 17:25:39 -07:00
tBunnyMan
38ffcfd4c4 Added the delevop_server script
This script and the small changes to quick start's makefile make for easily launching and killing of pelican --debug --autoreload and SimpleHTTPServer.
This is extra useful for working on templates.
2012-07-08 17:50:18 -07:00
Justin Mayer
764a2cfa51 Add dual dev/publish modes to quickstart script
Certain configuration options are more useful in production than they
are in development. Some examples might be absolute URLs, external
analytics service identifiers, Disqus comments, etc. This version of the
quickstart script creates two configuration files: one for development
and the other for use when publishing. In addition, the related docs
have been expanded considerably. Last but not least, the quickstart
script will now detect whether there is a project folder associated with
the currently active virtualenv (if any) and use it by default.
2012-07-07 07:41:12 -07:00
Justin Mayer
72421d4438 Support arbitrary SSH ports in pelican-quickstart
Some folks choose non-standard SSH ports for security reasons, so it
makes sense to try to support that in the pelican-quickstart script.
2012-07-05 11:34:45 -07:00
m-r-r
7c53cc8955 Moved templates in pelican_quistart.py to a directory 2012-05-06 12:07:13 +02:00