From 413410430850254ed8a03314f1b7aca720b3e9ca Mon Sep 17 00:00:00 2001 From: saschalalala Date: Sun, 13 May 2018 18:02:45 +0200 Subject: [PATCH] Replace more admin urls --- docs/deployment-on-heroku.rst | 2 +- docs/settings.rst | 2 +- hooks/post_gen_project.py | 2 +- {{cookiecutter.project_slug}}/config/urls.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/deployment-on-heroku.rst b/docs/deployment-on-heroku.rst index 1f249c44c..203d2ce0b 100644 --- a/docs/deployment-on-heroku.rst +++ b/docs/deployment-on-heroku.rst @@ -18,7 +18,7 @@ Run these commands to deploy the project to Heroku: heroku config:set WEB_CONCURRENCY=4 # Generating a 32 character-long random string without any of the visually similiar characters "IOl01": - heroku config:set DJANGO_ADMIN_URL="^$(openssl rand -base64 4096 | tr -dc 'A-HJ-NP-Za-km-z2-9' | head -c 32)/" + heroku config:set DJANGO_ADMIN_URL="$(openssl rand -base64 4096 | tr -dc 'A-HJ-NP-Za-km-z2-9' | head -c 32)/" heroku config:set DJANGO_SECRET_KEY="$(openssl rand -base64 64)" heroku config:set DJANGO_SETTINGS_MODULE=config.settings.production heroku config:set DJANGO_ALLOWED_HOSTS='.herokuapp.com' diff --git a/docs/settings.rst b/docs/settings.rst index 7962f7154..60593a5d1 100644 --- a/docs/settings.rst +++ b/docs/settings.rst @@ -18,7 +18,7 @@ DJANGO_READ_DOT_ENV_FILE READ_DOT_ENV_FILE False ======================================= =========================== ============================================== ====================================================================== Environment Variable Django Setting Development Default Production Default ======================================= =========================== ============================================== ====================================================================== -DJANGO_ADMIN_URL n/a r'^admin/' raises error +DJANGO_ADMIN_URL n/a 'admin/' raises error DJANGO_CACHES CACHES (default) locmem redis DJANGO_DATABASES DATABASES (default) See code See code DJANGO_DEBUG DEBUG True False diff --git a/hooks/post_gen_project.py b/hooks/post_gen_project.py index 5e60b23a8..79bdcfedc 100644 --- a/hooks/post_gen_project.py +++ b/hooks/post_gen_project.py @@ -160,7 +160,7 @@ def set_django_admin_url(file_path): django_admin_url = set_flag( file_path, "!!!SET DJANGO_ADMIN_URL!!!", - formatted="^{}/", + formatted="{}/", length=32, using_digits=True, using_ascii_letters=True, diff --git a/{{cookiecutter.project_slug}}/config/urls.py b/{{cookiecutter.project_slug}}/config/urls.py index 78e127d1a..62d86c94d 100644 --- a/{{cookiecutter.project_slug}}/config/urls.py +++ b/{{cookiecutter.project_slug}}/config/urls.py @@ -35,7 +35,7 @@ if settings.DEBUG: kwargs={"exception": Exception("Bad Request!")}, ), path( - r"403/", + "403/", default_views.permission_denied, kwargs={"exception": Exception("Permission Denied")}, ),