diff options
| author | ThibG <thib@sitedethib.com> | 2019-03-08 20:43:51 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-08 20:43:51 +0100 |
| commit | 42cc93e8923a1b6cdb61574e9a86e360cba56abb (patch) | |
| tree | b01c0a68ef1518b27c51aa382bc89a5ade3b93f8 /config | |
| parent | 93daa97fc33b663aacaf6656af25d25e0ba4499b (diff) | |
| parent | 674fe32f972614c1617e61bf946e58006d18d019 (diff) | |
Merge pull request #947 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'config')
| -rw-r--r-- | config/database.yml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/config/database.yml b/config/database.yml index 82e560515..c10bff6b2 100644 --- a/config/database.yml +++ b/config/database.yml @@ -3,6 +3,7 @@ default: &default pool: <%= ENV["DB_POOL"] || ENV['MAX_THREADS'] || 5 %> timeout: 5000 encoding: unicode + sslmode: <%= ENV['DB_SSLMODE'] || "prefer" %> development: <<: *default @@ -31,3 +32,4 @@ production: host: <%= ENV['DB_HOST'] || 'localhost' %> port: <%= ENV['DB_PORT'] || 5432 %> prepared_statements: <%= ENV['PREPARED_STATEMENTS'] || 'true' %> + |