Commit Graph

218 Commits

Author SHA1 Message Date
Fabio C. Barrioneuvo da Luz
e953fda8df fix documentation about contrib/sites migrations 2016-09-29 01:43:48 -03:00
Daniel Roy Greenfeld
f803f8f2ab FAQ entry on combining multiple deployment options 2016-09-29 01:43:48 -03:00
Daniel Roy Greenfeld
4b95bd9c5e A little cleanup of the EB docs 2016-09-29 01:43:48 -03:00
Daniel Roy Greenfeld
716717fe53 Fix markup 2016-09-29 01:43:48 -03:00
Daniel Roy Greenfeld
0eaf6a7b0c Fix FAQ 2016-09-29 01:43:48 -03:00
Daniel Roy Greenfeld
cac685d909 Add Experimental AWS Elastic Beanstalk support (#817)
Includes:

* First pass at Elastic Beanstalk integration
* Gets code and elasticache working
* Very rudimentary documentation
* Includes post hook cleanup
2016-09-29 01:43:48 -03:00
Delio Castillo
3d25befb3f Updates to anymail 0.5 and adds new config setting for MAILGUN_SENDER_DOMAIN 2016-09-22 11:42:16 -07:00
Andreas
9f2fa4a0a9 Update to use Docker for Mac/Windows (#786)
Removed sections about using Docker Toolbox with virtualbox and added links to Docker for Mac/Windows.
Docker for Mac/Windows uses native virtual machines instead of virtualbox and introduces many improvements.
See: https://blog.docker.com/2016/03/docker-for-mac-windows-beta/

Resolves: #706
2016-09-12 15:53:21 +02:00
Jannis Gebauer
7d7b044432 Remove webpack and merge (#778) (#785)
* Remove webpack and merge

* Put postgresql_version line back in cookiecutter.json

* Put goldhand back in contributors file, added ssteinerX

* Add *.egginfo to .gitignore

* Fix dangling endif in README.rst
2016-09-12 00:22:21 +02:00
Jannis Gebauer
043ff3d8dc Merge pull request #636 from mirskiy/master
Changed nginx confs for dockers new networking
2016-08-31 11:39:16 +02:00
Andreas Meistad
41059ff4df Change use_python2 [N] to use_python3 [Y]
Fixes #747
2016-08-21 22:11:01 +02:00
Karlo Tamayo
95c31623c3 Update developing-locally-webpack.rst
Small typo fix
2016-08-18 17:10:11 -07:00
Manu Phatak
ca86da88c0 Update deployment-on-heroku.rst (#684) 2016-08-16 12:21:28 -07:00
Dan Mirsky
8f1ee0e68c Updated docker docs to renew with certbot
In order to resolve the name through docker's dns, we have to specify
the usual container name (certbot) - docker-compose only does
automatically this if you use `start certbot`, not with `run`.
Also added --rm to remove the container after it's done so we don't have
multiple with the same name
2016-07-25 16:07:48 -07:00
Karim Benbourenane
3bdb9bbd6e Update project-generation-options.rst
Added more complete documentation for the project generation options.
2016-06-28 17:16:07 -04:00
Will Farley
8880e777d2 WIP: Add webpack as an option (#610)
* Add webpack as an option

Adds webpack as a js_taskrunner option to cookiecutter-json. Will clone @hzdg/cookiecutter-webpack --pydanny-django branch into the project using cookiecutter's api in post_hooks.

The static webpack project will be placed into the <project_slug>/static/<project_slug>/ directory.
The webpack configs are placed in the ./config/ directory.

The cookiecutter-webpack project includes react / redux / karma configurations that are brought into the project.

* Add webpack documentation
2016-06-19 12:24:43 -07:00
Daniel Roy Greenfeld
0a6b06ebe4 Breakup the backups section for docker into its own document 2016-06-14 14:32:14 -07:00
Audrey Roy Greenfeld
ad4082ceae Minor doc improvements 2016-06-13 08:40:48 -07:00
Audrey Roy Greenfeld
082765a4fb Merge pull request #612 from kappataumu/fix-603
Fixes #603
2016-06-13 08:37:19 -07:00
kappataumu
eeae4e8978 Move e-mail backend setup info for docker to the appropriate section 2016-06-13 12:56:12 +00:00
kappataumu
bfe72d5276 Point to the docs instead of repeating everything 2016-06-13 12:32:13 +00:00
kappataumu
1e47efac8a Fix reST issues 2016-06-13 12:32:13 +00:00
kappataumu
8b8b13ed0d Fixes #603 2016-06-13 11:29:23 +00:00
Daniel Roy Greenfeld
0b59df7af4 Warn about scaling nginx 2016-06-12 23:11:50 -07:00
Antonia Blair
b100f2a00d Tweak env vars section of docs (#611)
Thanks for the PR! 🍡
2016-06-11 20:50:25 -07:00
Audrey Roy Greenfeld
56efcaa475 Minor deployment-with-docker.rst improvements 2016-06-08 12:51:55 -07:00
Audrey Roy Greenfeld
ae5be42ff4 Reorder Docker deployment sections. Fix #606 2016-06-08 12:36:34 -07:00
Audrey Roy Greenfeld
3c980f13a3 More Docker docs tidying 2016-06-08 12:33:18 -07:00
Audrey Roy Greenfeld
7de7aed7ab Copyright year in non-templated docs/ folder can't be templated 2016-06-08 11:31:33 -07:00
Audrey Roy Greenfeld
f358204bdc Minor improvements to 'Deployment with Docker'. Part of #566 2016-06-08 11:12:10 -07:00
Daniel Roy Greenfeld
f40f304457 Use sentry for error reporting 2016-06-05 10:47:07 -07:00
Daniel Roy Greenfeld
b2d0a86344 simplify cookiecutter.json 2016-06-04 17:16:48 -07:00
Daniel Roy Greenfeld
e5b3b85620 Reorder index 2016-06-04 16:11:14 -07:00
mjsisley
fd9795992a sync with master 2016-06-03 17:21:24 -07:00
Audrey Roy Greenfeld
39fe13bea8 Merge pull request #582 from EMCain/my-favorite-cookie
[wip] my-favorite-cookie tutorial
2016-06-03 15:40:36 -07:00
Audrey Roy Greenfeld
87845bd817 Temp quick fixes to improve developing-locally doc 2016-06-03 15:31:50 -07:00
Emily C
ffc83080c7 initial commit 2016-06-03 15:23:00 -07:00
mjsisley
6885547b6a Adding documentation for debugging with Docker (#575)
* Adding documentation for debugging with Docker

* Add -f dev.yml
2016-06-03 12:50:23 -07:00
Meghan Heintz
ecc81134dd Adding troubleshotting to index 2016-06-03 12:04:11 -07:00
Meghan Heintz
4b6707fe7b adding troubleshooting doc 2016-06-03 11:58:37 -07:00
mjsisley
b8e02d2189 Add certbot(letsencrypt) support for docker 2016-06-03 08:07:39 -07:00
mjsisley
329ff57551 Adding documentation for debugging with Docker 2016-06-03 06:04:16 -07:00
Meghan Heintz
a25c57f0f4 postgres installation guide for mac, windows IP (#571)
* postgres installation guide for mac windows IP

* postgres install guide for mac ip windows
2016-06-02 18:28:50 -07:00
shireenrao
e8b0baf36c Update developing locally docs on how to setup .env file
Even though a link to the django-environ is there, it may help to see that .env file needs to be present for it to work.
2016-05-23 22:37:47 -04:00
Jannis Gebauer
b21a27c1a5 fixed typo 2016-05-22 20:23:53 +02:00
Jannis Gebauer
c35fc6acbe Merge branch 'master' of https://github.com/phiberjenz/cookiecutter-django into phiberjenz-master 2016-05-22 20:19:04 +02:00
Jannis Gebauer
24d75ebe45 resolved merge conflicts 2016-05-22 20:18:08 +02:00
phiberjenz
82dae58061 Added instructions on how to copy backups from Docker container to host 2016-05-19 15:30:30 +02:00
phiberjenz
8795dacbb3 Added instructions on how to copy backups from Docker container to host 2016-05-19 15:27:33 +02:00
Daniel Roy Greenfeld
7b24c19ce5 Fix #524 2016-05-09 21:12:34 -07:00
Fabio C. Barrioneuvo da Luz
2b878fcf36 replace occurrences of readthedocs.org to readthedocs.io 2016-05-09 17:18:58 -03:00
shireenrao
8cbe97bb9f Added a comment on how to use mailhog
As somebody new to mailhog, I was a confused on how to use it. I first assumed, it was going to be used by the django app itself. After reading more on the internet I found it needed to be executed outside of the django application.
2016-05-09 14:33:21 -04:00
Audrey Roy Greenfeld
bd9e437717 Update name per #524 2016-05-08 21:31:12 -07:00
Daniel Roy Greenfeld
8ac31962d6 Added PythonAnywhere to the docs index 2016-04-26 21:57:38 -07:00
Daniel Roy Greenfeld
da76b4d62e Merge pull request #532 from hjwp/master
Deployment instructions for PythonAnywhere. Fixes #236
2016-04-26 21:50:22 -07:00
Harry
fee825e889 another formatting tweak 2016-04-25 17:38:45 +01:00
Harry
54503562f8 formatting tweak 2016-04-25 17:36:38 +01:00
Harry
1224ae9e5b fix a few typos and syntax errors 2016-04-25 17:33:42 +01:00
Harry
55faf7fd2c Update instructions for latest version of cookiecutter 2016-04-25 17:24:41 +01:00
Harry
0e979f3470 First cut of pythonanywhere deployment instructions. need updating for mailgun. 2016-04-25 15:47:13 +01:00
Audrey Roy Greenfeld
fb59c5117b More repo_name -> project_slug cleanup 2016-04-20 11:41:17 -07:00
Audrey Roy Greenfeld
15f350f05e Change repo_name to project_slug for clarity. 2016-04-20 10:00:35 -07:00
Krzysztof Szumny
8a682818b3 Additional conditions with use_docker 2016-04-18 23:25:49 +02:00
Krzysztof Szumny
7c4135fb45 grunt and documentation cleanning 2016-04-18 23:03:41 +02:00
Bo Lopker
a300f1190d Quote consistency 2016-04-15 23:29:04 -07:00
Jannis Gebauer
0954ec8dad switch to named docker volumes 2016-04-08 08:31:02 +02:00
Jannis Gebauer
5b1b6ae4aa added docker database backups documentation 2016-03-08 10:42:46 +01:00
Jannis Gebauer
9b5f91efb3 updates docs for docker 1.10 2016-03-08 10:07:48 +01:00
Eraldo Energy
22acc55bcc Update settings.rst 2016-02-16 19:07:20 +01:00
Jay
9a2f72773a fixed new relic app name
The app name wasn't displayed correctly on the new relic dashboard.

Although `NEW_RELIC_APP_NAME` was set in `production.py`, the variable was not loaded *before* the newrelic agent was called.

Since the new relic agent is loaded at a very low level, NEW_RELIC_APP_NAME has to be set before django settings are imported.
2016-01-26 17:04:59 +01:00
Daniel Roy Greenfeld
07514be580 Fixes #345 explain need for django.contrib.sites 2016-01-16 10:40:32 -08:00
Daniel Roy Greenfeld
39dffcbf9f Merge pull request #465 from highpost/master
Added an explanation of how to define the DATABASE_URL environment va…
2016-01-15 10:21:22 -08:00
Daniel Sears
57aed057cc Added an explanation of how to define the DATABASE_URL environment variable. 2016-01-08 15:40:19 -08:00
Audrey Roy Greenfeld
5a65c9e8a9 Merge contributors change. 2016-01-06 21:37:23 -08:00
Jannis Gebauer
65e2d411a0 tweaked docker docs 2016-01-04 11:52:26 +01:00
Daniel Roy Greenfeld
7c0348a9e3 Merge pull request #435 from areski/bump-to-django19
Bump Django to v1.9
2015-12-13 09:42:47 -08:00
areski
c2e79902bf Bump Django to v1.9 2015-12-09 13:33:17 +01:00
Sydney Henry
4291243a9c Keep admin url short 2015-12-08 22:16:22 -07:00
Sydney Henry
21f5637a65 SECRET_KEY gen to short
when `heroku run python manage.py check --deploy` is ran this error occurs
?: (security.W009) Your SECRET_KEY has less than 50 characters or less than 5 unique characters. Please generate a long and random SECRET_KEY, otherwise many of Django's security-critical features will be vulnerable to attack.

changing the num of ran to a larger number fixes this issue
2015-12-08 22:10:46 -07:00
David Díaz
cc1da172f4 [IMP] django-allauth configuration: Allow enable or disable user registration using ACCOUNT_ALLOW_REGISTRATION setting. 2015-12-05 20:12:53 +01:00
Thomas Korrison
a304e466a5 Update developing-locally.rst 2015-12-01 14:25:55 +00:00
Thomas Korrison
917bf99ea3 Update developing-locally.rst 2015-12-01 14:09:50 +00:00
Tom Atkins
3316a3b023 Fix merge conflict in README.rst 2015-11-18 11:16:25 +00:00
Burhan Khalid
4c07b5dea6 initial configuration to support opbeat 2015-11-16 21:41:06 +03:00
Burhan Khalid
b78b2ddf73 fixing error in settings 2015-11-16 21:24:21 +03:00
Jay
1ce169d5de added NEW_RELIC_LICENSE_KEY to environment variables 2015-11-07 20:20:19 +01:00
Audrey Roy Greenfeld
1a4e5738d4 Merge pull request #371 from yunti/patch-1
Update deployment-on-heroku.rst for ADMIN_URL
2015-10-28 20:46:38 -07:00
Audrey Roy Greenfeld
1a886dc098 Merge pull request #377 from MathijsHoogland/patch-2
Added clarification on building for local or production
2015-10-14 13:04:59 -07:00
Audrey Roy Greenfeld
251e8d1ddd Document the project generation options. 2015-10-14 12:59:14 -07:00
MathijsHoogland
c04883fd52 Added clarification on building for local or production 2015-10-14 15:05:34 +02:00
yunti
93592326c1 Update deployment-on-heroku.rst 2015-10-09 15:45:07 +01:00
Daniel Roy Greenfeld
d022bc89f0 Update developing-locally.rst 2015-10-07 09:51:18 -07:00
Daniel Roy Greenfeld
e031ed8e6f Fixing database configuration. 2015-10-07 09:50:21 -07:00
Daniel Greenfeld
c1a90af9ad Update developing-locally-docker.rst 2015-10-04 12:09:18 -07:00
Audrey Roy Greenfeld
fdedd151ab Fix formatting in Detached Mode section. 2015-10-04 11:47:58 -07:00
Audrey Roy Greenfeld
d19ddbcf1e Explain Docker Toolbox better. 2015-10-03 16:59:52 -07:00
Audrey Roy Greenfeld
d09abc8d86 More simplification. 2015-10-03 16:56:53 -07:00
Audrey Roy Greenfeld
2d609432b9 Add @jayfk's note from #356. 2015-10-03 16:54:01 -07:00
Audrey Roy Greenfeld
c9b4d1f16e Unify docker-compose run sections. 2015-10-03 16:44:43 -07:00
Audrey Roy Greenfeld
765bb32fbe Simplify redundant parts of docker-compose instructions. 2015-10-03 16:35:48 -07:00
Audrey Roy Greenfeld
606b026a8c Simplify docs and un-deprecate the part that's still valid. 2015-10-03 16:21:08 -07:00
Audrey Roy Greenfeld
6258583fb1 Docker Toolbox includes Virtualbox. No need to repeat. 2015-10-03 16:15:02 -07:00
Daniel Roy Greenfeld
ab62fdb4ac Obfuscating the Django admin URL on Heroku 2015-10-03 14:58:09 -07:00
Daniel Roy Greenfeld
58ec2fe113 URL to django.contrib.admin is now configurable 2015-10-03 14:54:29 -07:00
Audrey Roy Greenfeld
6f4cd7f0ce Merge pull request #350 from andor-pierdelacabeza/patch-1
Fixed reStructuredText (RST) format
2015-09-29 11:08:19 -07:00
Jannis Gebauer
d8a7081d4c Added advice on how to persist changes with boot2docker 2015-09-28 09:42:13 +02:00
Alvaro [Andor]
bdd916835e Fixed reStructuredText (RST) format
The lack of a space between the '::' tag and the text did that the block around the code didn't appear.
2015-09-27 19:42:21 +02:00
Audrey Roy Greenfeld
42fe4f645b Update pylint and pep8 docs. 2015-09-26 00:50:54 -07:00
Audrey Roy Greenfeld
481bdb71b3 More linter documentation in prep for merging #283. 2015-09-26 00:35:55 -07:00
Audrey Roy Greenfeld
b642fed5bb Starter docs on our flake8 setup. 2015-09-24 00:38:04 -07:00
Daniel Roy Greenfeld
8b3fbce4a2 Add documentation refactor note #335 2015-09-18 14:35:10 -07:00
Daniel Roy Greenfeld
698c990cbd Refactored the Docker docs and added indexes. 2015-09-18 14:26:29 -07:00
Daniel Roy Greenfeld
44814f3ced Add FAQ and early work on file copier #335 2015-09-18 10:55:06 -07:00
Daniel Roy Greenfeld
275f7eee14 Big reorganization of documentation 2015-09-18 10:20:48 -07:00
Daniel Roy Greenfeld
904d2d50fe More docs configuration for #335 2015-09-18 09:32:47 -07:00
Daniel Roy Greenfeld
27b59b460c Beginning of reorganization of documentation per #335
* Created top-level docs Sphinx directory
* Moved development instructions out of /README.rst and into /docs/
2015-09-18 09:22:55 -07:00
Daniel Greenfeld
c8a01b6bad Fix the layout to match the cookie cutter pattern 2013-08-15 20:03:08 +02:00
Daniel Greenfeld
b24dc7259c Bring over a bunch of stuff from two scoops project 2013-08-14 20:01:41 +02:00