From ef3453b48ce4822e26f9a50b3ee99b4765921cbb Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Wed, 28 Nov 2018 15:15:39 -0400 Subject: [PATCH] Documentation: Fix error in example setting The example MAYAN_DATABASES setting was missing the 'default' database key. Signed-off-by: Roberto Rosario --- docs/chapters/deploying.rst | 8 ++++---- docs/chapters/docker_installation.rst | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/chapters/deploying.rst b/docs/chapters/deploying.rst index b2161d3eba..d39317f834 100644 --- a/docs/chapters/deploying.rst +++ b/docs/chapters/deploying.rst @@ -73,7 +73,7 @@ Initialize the project: ----------------------- :: - sudo -u mayan MAYAN_DATABASES='{ENGINE: django.db.backends.postgresql, NAME: mayan, PASSWORD: mayanuserpass, USER: mayan, HOST=127.0.0.1}' \ + sudo -u mayan MAYAN_DATABASES='{default: {ENGINE: django.db.backends.postgresql, NAME: mayan, PASSWORD: mayanuserpass, USER: mayan, HOST=127.0.0.1}}' \ MAYAN_MEDIA_ROOT=/opt/mayan-edms/media \ /opt/mayan-edms/bin/mayan-edms.py initialsetup @@ -95,7 +95,7 @@ Create the supervisor file at ``/etc/supervisor/conf.d/mayan.conf``: MAYAN_BROKER_URL="redis://127.0.0.1:6379/0", PYTHONPATH=/opt/mayan-edms/lib/python2.7/site-packages:/opt/mayan-edms/data, MAYAN_MEDIA_ROOT=/opt/mayan-edms/media, - MAYAN_DATABASES='{ENGINE: django.db.backends.postgresql, HOST: 127.0.0.1, NAME: mayan, PASSWORD: mayanuserpass, USER: mayan, CONN_MAX_AGE: 60}', + MAYAN_DATABASES='{default: {ENGINE: django.db.backends.postgresql, HOST: 127.0.0.1, NAME: mayan, PASSWORD: mayanuserpass, USER: mayan, CONN_MAX_AGE: 60}}', DJANGO_SETTINGS_MODULE=mayan.settings.production [program:mayan-gunicorn] @@ -234,7 +234,7 @@ Initialize the project: ----------------------- :: - sudo -u mayan MAYAN_DATABASES='{ENGINE: django.db.backends.postgresql, NAME: mayan, PASSWORD: mayanuserpass, USER: mayan, HOST=127.0.0.1}' \ + sudo -u mayan MAYAN_DATABASES='{default: {ENGINE: django.db.backends.postgresql, NAME: mayan, PASSWORD: mayanuserpass, USER: mayan, HOST=127.0.0.1}}' \ MAYAN_MEDIA_ROOT=/opt/mayan-edms/media \ /opt/mayan-edms/bin/mayan-edms.py initialsetup @@ -264,7 +264,7 @@ Create the supervisor file at ``/etc/supervisor/conf.d/mayan.conf``: MAYAN_BROKER_URL="amqp://mayan:mayanrabbitmqpassword@localhost:5672/mayan", PYTHONPATH=/opt/mayan-edms/lib/python2.7/site-packages:/opt/mayan-edms/data, MAYAN_MEDIA_ROOT=/opt/mayan-edms/media, - MAYAN_DATABASES='{ENGINE: django.db.backends.postgresql, HOST: 127.0.0.1, NAME: mayan, PASSWORD: mayanuserpass, USER: mayan, CONN_MAX_AGE: 60}', + MAYAN_DATABASES='{default: {ENGINE: django.db.backends.postgresql, HOST: 127.0.0.1, NAME: mayan, PASSWORD: mayanuserpass, USER: mayan, CONN_MAX_AGE: 60}}', DJANGO_SETTINGS_MODULE=mayan.settings.production [program:mayan-gunicorn] diff --git a/docs/chapters/docker_installation.rst b/docs/chapters/docker_installation.rst index a022168edc..63b1af515f 100644 --- a/docs/chapters/docker_installation.rst +++ b/docs/chapters/docker_installation.rst @@ -51,7 +51,7 @@ identifier:: --name mayan-edms \ --restart=always \ -p 80:8000 \ - -e MAYAN_DATABASES='{ENGINE: django.db.backends.postgresql, HOST: 172.17.0.1, NAME: mayan, PASSWORD: mayanuserpass, USER: mayan, CONN_MAX_AGE: 60}' \ + -e MAYAN_DATABASES='{default: {ENGINE: django.db.backends.postgresql, HOST: 172.17.0.1, NAME: mayan, PASSWORD: mayanuserpass, USER: mayan, CONN_MAX_AGE: 60}}' \ -v /docker-volumes/mayan-edms/media:/var/lib/mayan \ mayanedms/mayanedms: @@ -104,6 +104,6 @@ instead of the IP address of the Docker host (``172.17.0.1``):: --network=mayan \ --restart=always \ -p 80:8000 \ - -e MAYAN_DATABASES='{ENGINE: django.db.backends.postgresql, HOST: mayan-edms-postgres, NAME: mayan, PASSWORD: mayanuserpass, USER: mayan, CONN_MAX_AGE: 60}' \ + -e MAYAN_DATABASES='{default: {ENGINE: django.db.backends.postgresql, HOST: mayan-edms-postgres, NAME: mayan, PASSWORD: mayanuserpass, USER: mayan, CONN_MAX_AGE: 60}}' \ -v /docker-volumes/mayan-edms/media:/var/lib/mayan \ mayanedms/mayanedms: