diff --git a/README.org b/README.org index 3d4112a..8fab0c9 100644 --- a/README.org +++ b/README.org @@ -126,6 +126,7 @@ Create a backup file with today's date Import previously made backup #+BEGIN_SRC bash +docker exec -i -u {USER} {CONTAINER_NAME} pg_restore --verbose --no-acl --no-owner --clean --role=postgres -Upostgres --dbname={DATABASE_USER} < dump_31-01-2018_13_09_24.pgdata docker exec -i -u {USER} {CONTAINER_NAME} pg_restore -C --clean -d {DATABASE_USER} < dump_31-01-2018_13_09_24.pgdata cat dump_27-01-2018_14_26_09.sql | docker exec -i {CONTAINER_ID} psql -U postgres #+END_SRC diff --git a/config/settings/common.py b/config/settings/common.py index c70a6d4..0530782 100644 --- a/config/settings/common.py +++ b/config/settings/common.py @@ -509,8 +509,6 @@ COMPRESS_URL = 'cache/' # django-debug-toolbar # ---------------------MDVTDNXFTRJSJBX9KWOJTMCGSNMYASEFNBPDUZJMGSPPCVMQRUZMZAEXDTIGHPZCP9JBGLVKGSJMZKPVV--------------------------------------------------------- -MIDDLEWARE += ('debug_toolbar.middleware.DebugToolbarMiddleware',) -INSTALLED_APPS += ('debug_toolbar', ) ALLOWED_HOSTS = ['*'] INTERNAL_IPS = ['127.0.0.1', '10.0.2.2', '172.22.0.9', '192.168.1.113', '172.22.0.4', '0.0.0.0', '192.168.1.64'] diff --git a/config/settings/local.py b/config/settings/local.py index 87eebdf..8019823 100644 --- a/config/settings/local.py +++ b/config/settings/local.py @@ -1,36 +1,13 @@ # -*- coding: utf-8 -*- -""" -Local settings - -- Run in Debug mode - -- Use mailhog for emails - -- Add Django Debug Toolbar -- Add django-extensions as app -""" import socket import os from .common import * # noqa -# DEBUG -# ------------------------------------------------------------------------------ DEBUG = env.bool('DJANGO_DEBUG', default=True) DEBUG = True TEMPLATES[0]['OPTIONS']['debug'] = DEBUG -# SECRET CONFIGURATION -# ------------------------------------------------------------------------------ -# See: https://docs.djangoproject.com/en/dev/ref/settings/#secret-key -# Note: This key only used for development and testing. - -# django-debug-toolbar -# ---------------------MDVTDNXFTRJSJBX9KWOJTMCGSNMYASEFNBPDUZJMGSPPCVMQRUZMZAEXDTIGHPZCP9JBGLVKGSJMZKPVV--------------------------------------------------------- -# MIDDLEWARE += ('debug_toolbar.middleware.DebugToolbarMiddleware',) -# MIDDLEWARE_CLASSES += ('debug_toolbar.middleware.DebugToolbarMiddleware',) -# INSTALLED_APPS += ('debug_toolbar', ) - # ALLOWED_HOSTS = ['*'] # INTERNAL_IPS = ['127.0.0.1', '10.0.2.2', '172.22.0.9', '192.168.1.113', '172.22.0.4', '0.0.0.0'] # tricks to have debug toolbar when developing with docker @@ -40,6 +17,8 @@ if os.environ.get('USE_DOCKER') == 'yes': ip = socket.gethostbyname(socket.gethostname()) INTERNAL_IPS += [ip[:-1] + "1"] +MIDDLEWARE += ('debug_toolbar.middleware.DebugToolbarMiddleware',) +INSTALLED_APPS += ('debug_toolbar', ) DEBUG_TOOLBAR_CONFIG = { 'DISABLE_PANELS': [ 'debug_toolbar.panels.redirects.RedirectsPanel',