From dd48aa73e24696df5d8df4df68c8e9bc69cc1c19 Mon Sep 17 00:00:00 2001 From: Sandro Santilli Date: Thu, 21 Nov 2013 15:55:20 +0100 Subject: [PATCH] Improve documentation for postgres_auth_* configuration directives --- config/environments/development.js.example | 3 +++ config/environments/production.js.example | 3 +++ config/environments/staging.js.example | 3 +++ config/environments/test.js.example | 3 +++ 4 files changed, 12 insertions(+) diff --git a/config/environments/development.js.example b/config/environments/development.js.example index 8f57d986..03b352e5 100644 --- a/config/environments/development.js.example +++ b/config/environments/development.js.example @@ -10,7 +10,10 @@ var config = { ,enable_cors: true ,cache_enabled: false ,log_format: '[:date] :req[X-Real-IP] :method :req[Host]:url :status :response-time ms -> :res[Content-Type] (:res[X-Tiler-Profiler])' + // Templated database username for authorized user + // Supported labels: 'user_id' (read from redis) ,postgres_auth_user: 'development_cartodb_user_<%= user_id %>' + // Templated database password for authorized user // Supported labels: 'user_id', 'user_password' (both read from redis) ,postgres_auth_pass: '<%= user_password %>' ,postgres: { diff --git a/config/environments/production.js.example b/config/environments/production.js.example index 4f63a919..db418ca7 100644 --- a/config/environments/production.js.example +++ b/config/environments/production.js.example @@ -10,7 +10,10 @@ var config = { ,enable_cors: true ,cache_enabled: true ,log_format: '[:date] :req[X-Real-IP] :method :req[Host]:url :status :response-time ms -> :res[Content-Type] (:res[X-Tiler-Profiler])' + // Templated database username for authorized user + // Supported labels: 'user_id' (read from redis) ,postgres_auth_user: 'cartodb_user_<%= user_id %>' + // Templated database password for authorized user // Supported labels: 'user_id', 'user_password' (both read from redis) ,postgres_auth_pass: '<%= user_password %>' ,postgres: { diff --git a/config/environments/staging.js.example b/config/environments/staging.js.example index 5dd3a27b..a2918b74 100644 --- a/config/environments/staging.js.example +++ b/config/environments/staging.js.example @@ -10,7 +10,10 @@ var config = { ,enable_cors: true ,cache_enabled: true ,log_format: '[:date] :req[X-Real-IP] :method :req[Host]:url :status :response-time ms (:res[X-Tiler-Profiler]) -> :res[Content-Type]' + // Templated database username for authorized user + // Supported labels: 'user_id' (read from redis) ,postgres_auth_user: 'cartodb_staging_user_<%= user_id %>' + // Templated database password for authorized user // Supported labels: 'user_id', 'user_password' (both read from redis) ,postgres_auth_pass: '<%= user_password %>' ,postgres: { diff --git a/config/environments/test.js.example b/config/environments/test.js.example index 2edf8452..067a62e1 100644 --- a/config/environments/test.js.example +++ b/config/environments/test.js.example @@ -10,7 +10,10 @@ var config = { ,enable_cors: true ,cache_enabled: false ,log_format: '[:date] :req[X-Real-IP] :method :req[Host]:url :status :response-time ms -> :res[Content-Type] (:res[X-Tiler-Profiler])' + // Templated database username for authorized user + // Supported labels: 'user_id' (read from redis) ,postgres_auth_user: 'test_cartodb_user_<%= user_id %>' + // Templated database password for authorized user // Supported labels: 'user_id', 'user_password' (both read from redis) ,postgres_auth_pass: 'test_cartodb_user_<%= user_id %>_pass' ,postgres: {