Commit Graph

184 Commits

Author SHA1 Message Date
Nikita Shupeyko
5c166b28a9
Remove "My Favorite Cookie" tutorial (#1633)
Closes #1611.
2018-05-06 19:37:57 +03:00
Nikita P. Shupeyko
a22390ad4f Introduce debug cookiecutter option 2018-05-05 13:47:25 +03:00
Marlon
21dd198761 Update deployment-on-heroku.rst (#1630)
`heroku python manage.py migrate` no longer necessary, since it's now run by the release process in the Procfile. Related to https://github.com/pydanny/cookiecutter-django/pull/1615
2018-05-05 12:28:46 +03:00
Nikita Shupeyko
b4d0416530
Fix PostgreSQL backup restore (#1628)
* Export PG* envs when backing up postgres

* Export PG* envs when restoring postgres from backup

* Prevent postgres connection from dropping all at ones

* Alter postgres backups docs  

Include another crucial prerequisite.

* "feel free switching" -> "feel free to switch"

* Address the feedback
2018-05-05 12:27:27 +03:00
Daniel Roy Greenfeld
3f753e0411
First pass at running black across the project (#1602) 2018-04-08 17:03:29 -05:00
MaziyarMK
0e7005d3d1
Fixes heroku deployment error
Specifically fixes this confusing error: ModuleNotFoundError: No module named "'config"
The single quotes are not required in the heroku config vars.
2018-04-08 10:04:31 +04:00
Nikita P. Shupeyko
418b53bf77 Rename use_sentry_for_error_reporting to use_sentry
Rationale: consistency
2018-04-03 12:12:26 +03:00
Bruno Alla
53623ae1fe Document server error when missing Mailgun config
Fixes #789
2018-03-26 23:31:10 +01:00
Wan Liuyang
d1198f63b1
Drop Opbeat (#1578) 2018-03-21 19:54:27 +08:00
Nikita Shupeyko
bcd0a8c46e
Fix & improve PostgreSQL backup/restore scripts (#1571)
* Fix & imporve postgres backup/restore scripts

* Update PostgreSQL backup/restore docs

* Fix postgres Dockerfile regression

* Extend error messages in PostgreSQL maintenance scipts
2018-03-14 13:44:16 +03:00
Nikita P. Shupeyko
a31f5090d1 Update the docs 2018-03-09 21:55:30 +03:00
Nikita P. Shupeyko
9cd0ee0272 Document merge_production_dotenvs_in_dotenv.py usage 2018-03-09 13:16:56 +03:00
Nikita P. Shupeyko
5543359382 Distinguish between POSTGRES_DB and POSTGRES_USER
Closes #1301.
2018-03-08 19:04:10 +03:00
Nikita Shupeyko
3f8aa26d0f
Group environment variables by the corresponding directories (#1295)
* Update generated project's .gitignore

* Post-gen gitignore .env/ and .env

* Fix linesep between gitignored entries

* Persist `.env/**/*` files into cookiecutter-django's VCS

* Rename .env/ to .envs/

* Reference the newly created .envs/**/.* files in local.yml

* Reference the newly created .envs/**/.* files in production.yml

* Delete .env.example

* Refactor post-gen-project.py

Closes #1299.

* Implement production-dotenv-files-to-dotenv-file merge script

* Create shared PyCharm Run Configuration for the automation script

* Randomize POSTGRES_PASSWORD in ./envs/(.local|.production)/.postgres

* Default POSTGRES_PASSWORD and POSTGRES_USER to random values

* Fix jinja linebreaks in local.yml

* Spaces in production.yml

* Fix post-merge leftovers & set DJANGO_ADMIN_URL automatically

* Prettify here and there

* Fix FileNotFoundError

* Leave a TODO in post_gen_hook.py

* Introduce keep_local_envs_in_vcs option

* Remove envs when not opted for

* Inline pre_gen_project.py if-condition

* Get rid of PROJECT_DIR_PATH in post_gen_project.py

* Clean up the docs

* Match copyright notices

* Document envs ins and outs
2018-03-08 15:56:15 +03:00
Eric Groom
f67f37a463 update grunt-sass to latest version (#1544)
* update grunt-sass

* add to contributors

* update gulp deps

* update grunt deps

* add convenience run script to grunt and gulp configurations
2018-03-06 19:46:21 +03:00
Bruno Alla
6ef30b1741 Merge branch 'master' into simplify-environment
# Conflicts:
#	docs/deployment-on-heroku.rst
2018-03-06 09:55:28 +00:00
Nicholas
b4738d2ff3 Update Heroku deployment docs (#1548)
* Update Heroku deployment

Remove duplicate DJANGO_ADMIN_URL config, add SENTRY config

* Update deployment-on-heroku.rst
2018-03-06 12:44:44 +03:00
Melanie Crutchfield
9fca6019ec Update project-generation-options.rst (#1547)
Change small typo. "ones" should be "once".
2018-03-05 23:55:15 +01:00
Bruno Alla
82dcd2d30c Simplify Mailgun settings
When creating a Mailgun add-on on Heroku, the app gets some environment
variables by default:

    MAILGUN_API_KEY
    MAILGUN_DOMAIN

However, the cookiecutter names do not match and requires a manual step
from the user deploying. It's used elsewhere but shouldn't harm the
other deployment methods to rename these variables.

While updating the docs I noticed a variable that appear unused
DJANGO_MAILGUN_SERVER_NAME so this removes it from the documentation.
2018-03-05 17:56:45 +00:00
Bruno Alla
baf08b2f5f Document Gunicorn worker concurrency 2018-03-05 17:30:13 +00:00
Nikita P. Shupeyko
e4353a41ed Update project generation options docs 2018-03-05 13:54:35 +03:00
Nikita P. Shupeyko
00fbf63939 Document use_travisci cookiecutter option 2018-03-05 13:12:33 +03:00
Wan Liuyang
5f068dd972 Revert environment variables and update docs 2018-02-28 11:33:39 +08:00
Wan Liuyang
39d2000856 Merge branch 'master' of github.com:sfdye/cookiecutter-django into use-aws-roles 2018-02-28 10:16:48 +08:00
Nikita Shupeyko
86e33e8714
Refactor *_gen_project hooks (#1490)
* Fix ./hooks/pre_gen_project.py asking user to select an option once only

+ prettify output

* Fix pre_gen hook not really exiting when it should

* Refactor & prettify ./hooks/post_gen_project.py

* Ensure same POSTGRES_USER is set across environments

+ get rid of env.example in favor of pre-generated .env.
2018-02-07 22:52:52 +03:00
Bruno Alla
090c81731b
Merge pull request #1418 from reggieriser/django_python_upgrade_cleanups
Fixing leftovers from migration to Django 1.11 and Python 3.6.
2018-02-07 14:52:27 +00:00
Reggie Riser
3512bb6c32
Delete deployment-with-elastic-beanstalk.rst 2018-02-06 17:18:03 -05:00
Wan Liuyang
7aabfa0c36 Fix typo and revert AWS environment variable 2018-02-06 15:52:34 +08:00
Wan Liuyang
fd2e917ceb Use AWS IAM roles
- Remove usage of AWS_ACCESS_KEY_ID and AWS_SECRET_ACCESS_KEY
- Add instructions to set up IAM role
2018-02-06 15:14:37 +08:00
Bruno Alla
af12f39996 Improve custom_bootstrap_compilation option (#1429)
* Add Bootstrap to package.json in case of custom_bootstrap_compilation

* Update JS task runners and base HTML to handle custom scss compilation

* Generate a vendors.js with custom bootstrap compilation + Gulp

* Update documentation accordingly

* Add missing if/endif in gulpfile

* Update to Bootstrap v4 final
2018-01-20 17:05:12 -08:00
Daniel Roy Greenfeld
793a46ba45 Removed expiramental elastic beanstalk support and bumped official Django version to 1.11.9 2018-01-15 12:33:51 -08:00
pdehaye
184b3584a0 Helpful warning for Beanstalk/python 3.6 (#1432) 2018-01-04 17:54:58 -08:00
Reggie Riser
f7bd7a5814 Fixing leftovers from migration to Django 1.11 and Python 3.6. 2018-01-03 08:44:54 -05:00
Rafael Laverde
1d55a608c0 Change pep 8 for pycodestyle in docs and project requirements (#1332)
* Change pep8 for pycodestyle in the docs.

* Change pep8 for pycodestyle in project requirements.
2017-09-17 21:56:15 +03:00
Jannis Gebauer
5492a2b387 update with instructions for caddy, removing nginx 2017-08-14 11:48:17 +02:00
Jannis Gebauer
8801c50867 switch to caddy (#1282) 2017-08-11 11:16:15 +02:00
Ben Warren
ffedad9103 Add project generation option docs (#1267)
* Add project generation option docs

* Alter wording
2017-08-01 20:06:07 +03:00
Nathan Victor
b4e68a6bf1 Update 404 with how to link (#1244) 2017-07-31 16:57:33 +03:00
Shupeyko Nikita
fe903e5c14 Fix docs erros/typos (#1264)
* Fix #.1

* Fix #.2

[Running management commands: "docker-compose -f production.yml run" to "docker-compose -f local.yml run'](https://cookiecutter-django.readthedocs.io/en/latest/developing-locally-docker.html#running-management-commands).

* Fix #.3

Designate @bertdemiranda as a contributor (#1242).
2017-07-31 13:27:58 +03:00
Bert de Miranda
ce33b0c498 Update developing-locally-docker.rst (#1242) 2017-07-31 13:16:38 +03:00
Shupeyko Nikita
37837e9902 Fix ALLOWED_HOSTS (#1164) 2017-07-30 15:43:01 +03:00
Shupeyko Nikita
e889316b11 Rename dev.yml to local.yml (#1227)
* Rename dev.yml to local.yml

Closes #1226.

* Rename docker-compose.yml to production.yml
2017-07-14 17:09:41 +03:00
Shupeyko Nikita
1f7be4eb57 Revert "Node.JS + docker-compose = ♥" (#1206)
* Revert "[Fix] #1173 Nginx SSL redirect loop (#1174)"

This reverts commit cabcc7b106.

* Revert "Fix Getting Up and Running Locally With Docker doc sphinx warnings (#1165)"

This reverts commit 83c8594203.

* Revert "Fix index.rst sphinx warnings (#1166)"

This reverts commit 51dd0b5e73.

* Revert "Pin mailhog Docker image to v1.0.0 (#1201)"

This reverts commit d9f870461b.

* Revert "Node.JS + docker-compose = ♥ (#1128)"

This reverts commit 4b06fe3958.
2017-06-21 23:12:22 +03:00
Shupeyko Nikita
83c8594203 Fix Getting Up and Running Locally With Docker doc sphinx warnings (#1165) 2017-06-20 23:29:56 +03:00
Shupeyko Nikita
51dd0b5e73 Fix index.rst sphinx warnings (#1166) 2017-06-20 23:29:31 +03:00
Shupeyko Nikita
4b06fe3958 Node.JS + docker-compose = ♥ (#1128)
* Introduce static asset build infrastructure

* Enhance gulpfile.js

* Introduce node service

* BrowserSync debug-only support

* Remove newline before  BrowserSync debug-only support section

* FIx node Dockerfile package.json COPY

* Try fiixing node Dockerfile package.json COPY ones again

* Switch to `node:7-slim`

* Try switching to node:6

To account for possible node:7 docker-compose incompatibiltiy

* Revert "Try switching to node:6"

This reverts commit 62cc02df1a.

* Try switcging workdir to /app

* Try utilizing relative package.json path

* Resetting to the last version working locally with docker-compose 1.11.x

* Build upon the latest node:7.9-slim

* Stop dockerignoring package.json

* Fix typo

* Try a different package.json path

* Revert "Try a different package.json path"

This reverts commit f29f8500b8.

* Revert "Fix typo"

This reverts commit 02033729b5.

* Revert "Stop dockerignoring package.json"

This reverts commit 63c5491546.

* Upgrade docker-engine and docker-compose used by Travis CI

* Fix .travis.yml comments

* Inline docker-engine and docker-compose versions

* DEBUG: pwd

* Revert "DEBUG: pwd "

This reverts commit 6c2ed4321a.

* Try copying package.json to the same dir as node Dockerfile's

* Revert "Try copying package.json to the same dir as node Dockerfile's"

This reverts commit 24340a0783.

* Try out node:7.9

* Revert "Try out node:7.9"

This reverts commit 32286d33c2.

* Revert "Upgrade docker-engine and docker-compose used by Travis CI"

* Get rid of npm-check-updates

Reason: Reserved for the upcoming PR

* Get rid of npm-check

Reason: Reserved for the upcoming PR

* Get rid of 'standard' npm package

Reason: Reserved for the upcoming PR

* Clean up package.json

* Preserve package.json uncoditionally

Since we now have *unconditional* node.js integration, `package.json` must be out there whenever `node` service gets built

* Upgrade node service image to 7.10

* Document Node.js-Docker integration

* Fix gulpfile.js images region name

* Get rid of Gulp migrate task

* Document Gulp-Docker integration

* Introduce static asset build infrastructure

* Enhance gulpfile.js

* Introduce node service

* BrowserSync debug-only support

* Remove newline before  BrowserSync debug-only support section

* FIx node Dockerfile package.json COPY

* Try fiixing node Dockerfile package.json COPY ones again

* Switch to `node:7-slim`

* Try switching to node:6

To account for possible node:7 docker-compose incompatibiltiy

* Revert "Try switching to node:6"

This reverts commit 62cc02df1a.

* Try switcging workdir to /app

* Try utilizing relative package.json path

* Resetting to the last version working locally with docker-compose 1.11.x

* Build upon the latest node:7.9-slim

* Stop dockerignoring package.json

* Revert "Stop dockerignoring package.json"

This reverts commit 63c5491546.

* Fix typo

* Revert "Fix typo"

This reverts commit 02033729b5.

* Try a different package.json path

* Revert "Try a different package.json path"

This reverts commit f29f8500b8.

* Upgrade docker-engine and docker-compose used by Travis CI

* Fix .travis.yml comments

* Inline docker-engine and docker-compose versions

* DEBUG: pwd

* Revert "DEBUG: pwd "

This reverts commit 6c2ed4321a.

* Try copying package.json to the same dir as node Dockerfile's

* Revert "Try copying package.json to the same dir as node Dockerfile's"

This reverts commit 24340a0783.

* Try out node:7.9

* Revert "Try out node:7.9"

This reverts commit 32286d33c2.

* Revert "Upgrade docker-engine and docker-compose used by Travis CI"

* Get rid of npm-check-updates

Reason: Reserved for the upcoming PR

* Get rid of npm-check

Reason: Reserved for the upcoming PR

* Get rid of 'standard' npm package

Reason: Reserved for the upcoming PR

* Clean up package.json

* Preserve package.json uncoditionally

Since we now have *unconditional* node.js integration, `package.json` must be out there whenever `node` service gets built

* Upgrade node service image to 7.10

* Document Node.js-Docker integration

* Fix gulpfile.js images region name

* Get rid of Gulp migrate task

* Document Gulp-Docker integration

* Remove Gulp-Docker integraton not supported initialization message
2017-06-20 22:48:17 +03:00
Emile Petrone
ec62188fae Fix hard coded email (#1193) 2017-06-14 01:00:14 +03:00
mekhami
611159eecf Create deployment-with-docker.rst (#1189)
Just a little extra clarity on postgres and the .env file, inspired by #1188.
2017-06-08 12:55:29 -07:00
Cristian Samaniego
1ddc3fcef8 Fix typo and deprecated option in certbot command (#1185)
The --standalone-supported-challenges option has been deprecated since certbot version 0.9.0.
2017-06-02 22:47:53 +03:00
Cristian Samaniego
7c7176d4f9 Fix ipdb docker-compose needed command (#1175)
'run' must be after the -f flag
2017-05-19 21:26:20 +03:00