diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst index 414d2a33b..f06895ea4 100644 --- a/CONTRIBUTORS.rst +++ b/CONTRIBUTORS.rst @@ -107,6 +107,7 @@ Listed in alphabetical order. Lyla Fischer Martin Blech Mathijs Hoogland `@MathijsHoogland`_ + Matt Braymer-Hayes `@mattayes`_ @mattayes Matt Linares Matt Menzenski `@menzenski`_ Matt Warren `@mfwarren`_ @@ -124,9 +125,10 @@ Listed in alphabetical order. Roman Osipenko `@romanosipenko`_ Russell Davies Sam Collins `@MightySCollins`_ - stepmr `@stepmr`_ + Shupeyko Nikita `@webyneter`_ Sławek Ehlert `@slafs`_ Srinivas Nyayapati `@shireenrao`_ + stepmr `@stepmr`_ Steve Steiner `@ssteinerX`_ Sule Marshall `@suledev`_ Taylor Baldwin @@ -193,6 +195,7 @@ Listed in alphabetical order. .. _@knitatoms: https://github.com/knitatoms .. _@krzysztofzuraw: https://github.com/krzysztofzuraw .. _@MathijsHoogland: https://github.com/MathijsHoogland +.. _@mattayes: https://github.com/mattayes .. _@menzenski: https://github.com/menzenski .. _@mfwarren: https://github.com/mfwarren .. _@mimischi: https://github.com/mimischi @@ -206,6 +209,7 @@ Listed in alphabetical order. .. _@rm--: https://github.com/rm-- .. _@romanosipenko: https://github.com/romanosipenko .. _@shireenrao: https://github.com/shireenrao +.. _@webyneter: https://github.com/webyneter .. _@show0k: https://github.com/show0k .. _@shultz: https://github.com/shultz .. _@siauPatrick: https://github.com/siauPatrick diff --git a/cookiecutter.json b/cookiecutter.json index 84bbe5ef0..0bc2b90e2 100644 --- a/cookiecutter.json +++ b/cookiecutter.json @@ -15,7 +15,7 @@ "use_pycharm": "n", "windows": "n", "use_python3": "y", - "use_docker": "y", + "use_docker": "n", "use_heroku": "n", "use_elasticbeanstalk_experimental": "n", "use_compressor": "n", diff --git a/docs/deployment-on-heroku.rst b/docs/deployment-on-heroku.rst index 843e230fb..b84edfa46 100644 --- a/docs/deployment-on-heroku.rst +++ b/docs/deployment-on-heroku.rst @@ -3,7 +3,7 @@ Deployment on Heroku .. index:: Heroku -You can either push the 'deploy' button in your generated README.rst or run these commands to deploy the project to Heroku: +Run these commands to deploy the project to Heroku: .. code-block:: bash diff --git a/docs/deployment-on-pythonanywhere.rst b/docs/deployment-on-pythonanywhere.rst index 82399eb15..93f189601 100644 --- a/docs/deployment-on-pythonanywhere.rst +++ b/docs/deployment-on-pythonanywhere.rst @@ -47,7 +47,7 @@ Generate a secret key for yourself, eg like this: .. code-block:: bash - python -c 'import random; print("".join(random.SystemRandom().choice("abcdefghijklmnopqrstuvwxyz0123456789!@#$%^&*(-_=+)") for _ in range(50)))' + python -c 'import random;import string; print("".join(random.SystemRandom().choice(string.digits + string.ascii_letters + string.punctuation) for _ in range(50)))' Make a note of it, since we'll need it here in the console and later on in the web app config tab. @@ -179,5 +179,3 @@ For subsequent deployments, the procedure is much simpler. In a Bash console: And then go to the Web tab and hit **Reload** **TIP:** *if you're really keen, you can set up git-push based deployments: https://blog.pythonanywhere.com/87/* - - diff --git a/docs/deployment-with-docker.rst b/docs/deployment-with-docker.rst index 7aabbef0e..5025cdd37 100644 --- a/docs/deployment-with-docker.rst +++ b/docs/deployment-with-docker.rst @@ -155,7 +155,7 @@ If you have errors, you can always check your stack with `docker-compose`. Switc Supervisor Example ------------------- -Once you are ready with your initial setup, you wan't to make sure that your application is run by a process manager to +Once you are ready with your initial setup, you want to make sure that your application is run by a process manager to survive reboots and auto restarts in case of an error. You can use the process manager you are most familiar with. All it needs to do is to run `docker-compose up` in your projects root directory. diff --git a/docs/settings.rst b/docs/settings.rst index eb6e92a45..893a47e90 100644 --- a/docs/settings.rst +++ b/docs/settings.rst @@ -3,7 +3,14 @@ Settings This project relies extensively on environment settings which **will not work with Apache/mod_wsgi setups**. It has been deployed successfully with both Gunicorn/Nginx and even uWSGI/Nginx. -For configuration purposes, the following table maps environment variables to their Django setting: +For configuration purposes, the following table maps environment variables to their Django setting and project settings: + + +======================================= =========================== ============================================== ====================================================================== +Environment Variable Django Setting Development Default Production Default +======================================= =========================== ============================================== ====================================================================== +DJANGO_READ_DOT_ENV_FILE READ_DOT_ENV_FILE False False +======================================= =========================== ============================================== ====================================================================== ======================================= =========================== ============================================== ====================================================================== diff --git a/{{cookiecutter.project_slug}}/.idea/runConfigurations/Docker__tests___all.xml b/{{cookiecutter.project_slug}}/.idea/runConfigurations/Docker__tests___all.xml index 7ede8bfb5..02fba0797 100644 --- a/{{cookiecutter.project_slug}}/.idea/runConfigurations/Docker__tests___all.xml +++ b/{{cookiecutter.project_slug}}/.idea/runConfigurations/Docker__tests___all.xml @@ -4,7 +4,7 @@