1
0
Fork 0
forked from github/pelican
Commit graph

83 commits

Author SHA1 Message Date
Joao Moreira
d965575f4a Add current date when publishing with ghp tool.
Re-submission of #2083 based on Invoke's task.py.
2018-10-30 19:05:31 -05:00
Justin Mayer
a6600e2fca
Merge pull request #2378 from davidag/fix-makefile-template
Avoid escaping dollar signs in Makefile template
2018-07-09 10:42:58 +02:00
Kevin Deldycke
c04a4701b8 Replace Fabric by Invoke. 2018-07-08 21:33:10 +02:00
David Alfonso
7d18a4f3b8 Avoid escaping dollars in Makefile template
If dollars are escaped, the commands don't work as expected (i.e. doing
variable substitution).
2018-07-07 19:48:52 +02:00
Jorge Maldonado Ventura
ec15105c2f Remove extra endif from Makefile template 2018-07-03 20:57:12 +02:00
Johannes 'josch' Schauer
a5edbf8546 Remove develop_server.sh in favour of pelican serving static files itself
Competing static site generators integrate the functionality of regenerating
content and serving it into their main executable. In pelican this
functionality used to be in an external script `develop_server.sh` which
resides in the blog base directory. This has the disadvantage that changes in
pelican can break the `develop_server.sh` scripts which will not automatically
be upgraded together with pelican by package managers. Thus, pelican should
integrate this functionality into its main executable.

To this end, this commit removes `develop_server.sh` and adds three command
line options to the pelican executable:

 * `-l/--listen` starts the HTTP server (`-s/--serve` was already taken)
 * `-p/--port` specifies the port to listen at
 * `-b/--bind` specifies the IP to bind to

`--listen` and `--autoreload` can be used together to achieve the same
effect that other static site generators offer: Serve files via HTTP
while at the same time auto-generating the content.

Since the `develop_server.sh` script was removed, pelican-quickstart looses the
`develop` option.

Since the `develop_server.sh` script was removed, the Makefile looses the
`stopserver` target and the `devserver` target is replaced by running `pelican
-l` in the foreground.

Since pelican now offers the `--listen` option, the fabfile uses that instead
of starting the socketserver itself.
2018-06-22 19:22:38 +02:00
Siltaar
9e035ed727 fix ""DIR 2018-03-29 15:20:10 +02:00
Siltaar
e9c2409eab Allow develop_server.sh to work with paths containing spaces 2018-03-29 15:05:00 +02:00
ix5
6d46bf4257 pelican-quickstart: switch to jinja2
- Use the jinja2 templating language for Makefile, fabfile,
  pelicanconf, publishconf, and develop-server.sh
- Add logic in pelican_quickstart.py
- Let jinja2 handle opening and reading template files
- Remove thus unused functions for string.Template
2017-12-10 04:05:38 +01:00
Justin Mayer
68724e9682 Encourage use of https:// in SITEURL
Refs #2183 #2186
2017-07-25 09:00:41 -07:00
Jonas Lundholm Bertelsen
1c96d8c933 Correct import of socketserver on Python 3 2017-07-24 12:25:21 +02:00
evilroot
fdf355c377 Fix rsync_upload in Makefile template 2017-06-08 22:59:12 +01:00
fxfitz
b65a790b50 Switch over to use awscli 2017-03-13 17:59:43 -05:00
bnice5000
c11b8ceb09 Update rebuild to respect OUTPUT_RETENTION
Fixes #1955
2016-06-14 08:42:48 -04:00
Justin Mayer
132fe9a4fa Merge pull request #1923 from Jangsea/use_ghp_import_push_option
Use 'ghp-import -p' to push instead of 'git push origin {branch}'
2016-04-03 18:51:23 -07:00
Jangsea Park
23ab0f1ae1 Delete 'git push origin' and use 'ghp-import -p', push option 2016-03-03 15:11:58 +09:00
Jangsea Park
3857145754 Import env.github_pages_branch from quickstart question 2016-03-02 20:48:11 +09:00
Andreas Olsson
23a84e9b82 Adding missing Makefile PHONY target stopserver 2016-01-03 11:03:10 +01:00
HiPhish
1fe40db3cb Generate output directory before 'CD'ing into it.
If the output directory does not exist the 'cd' will fail, but the
script will resume, starting the server in the base directory. Therefore
we first make sure the output directory actually exists.
2015-11-14 00:17:09 +01:00
Michael Goodwin
5e7eb91808 add '--no-mime-magic --no-preserve' to s3_upload 2015-10-29 11:36:41 -04:00
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
Deniz Turgut
7b4ceb2974 Make pelican.server importable and use it in fab serve
`fab serve` and `make devserver` use different HTTP Handlers and as a
result they behave differently. This makes sure `fab serve` also uses
the Handler defined in `pelican.server` in order to get rid of the
inconsistency.
2015-04-03 18:58:52 -04: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
Midhul Varma
bbbb3247ea Add timezone prompt to quickstart. Refs 1337. 2014-12-29 04:26:51 +05:30
George V. Reilly
8cc2f99ec4 Fabfile improvements
- Remove gratuitous Unixisms so that fabfile will work on Windows
- Docstrings for tasks so `fab --list` is more useful.
- Add `gh_pages` task for publishing to GitHub Pages
  using [ghp-import](https://github.com/davisp/ghp-import)
2014-12-04 19:26:59 -08:00
Olivier Verdier
5b389d6f36 fix missing tab in Makefile template 2014-10-20 15:22:11 +02:00
winlu
9b4b123a0e add missing author feeds to pelicanconf template 2014-09-29 23:38:39 +02:00
Kyle Fuller
a3c8fca1db Merge pull request #1372 from Railslide/make_github_commit_message
change make github commit message
2014-07-08 12:46:00 +01:00
Eli Bendersky
43523dac4d Fix "server didn't start" error message in develop_server.sh
It has port 8000 hardcoded into it, which is confusing when the server runs on
another port.
2014-06-30 06:40:19 -07: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
Justin Mayer
fd231b6ce2 Remove errant leading spaces from fabfile.py.in 2014-04-30 13:35:10 -07: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
Tom Yubing Dong
786a209d2b ctrl+c now correctly terminates fab serve
Previously `ctrl+c` a `fab serve` wouldn't necessarily terminate the web server. Even if it does, re-using the command `fab serve` might result in the following error:

```
socket.error: [Errno 48] Address already in use
```

This fix manually creates a `TCPServer` with `allow_reuse_address` set to `True`, which solves this issue.

Tested on OS X 10.9.1.
2013-12-26 22:30:54 +08:00
Justin Mayer
3715749cc6 Minor wording changes in develop_server.sh 2013-12-11 21:09:02 -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
Tommy George
082ce1dd19 Update pelicanconf.py.in
pep8 issues
2013-12-03 09:48:10 -06:00
Justin Mayer
fb994b1399 Add content dir to default settings file template
This adds a line to the settings file generated by pelican-quickstart
that ensures the automatically-generated "content" directory is
specified in said settings file. Fixes #1116
2013-10-28 15:52:09 -07: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
Justin Mayer
30192b2318 Add fabfile generation to pelican-quickstart
This commit adds optional fabfile.py generation during the
pelican-quickstart process. Reasons include:

* "make" is cumbersome to install on Windows
* Fabric runs in any Python environment
* fabfile is just Python and thus more flexible and extensible

This is an initial implementation and does not currently provide as many
upload options as its Makefile counterpart.

Refs #584.
2013-07-29 11:03:14 -07:00
Stefan hr Berder
689632835e add port option to Makefile target serve/devserver 2013-07-07 14:28:31 +02:00
Stefan hr Berder
3a5db543bb add port parameter to bash script 2013-07-07 13:27:50 +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