Fix the SSL state for databases connections

Whenever possible, we use a socket connexion (all postgresql
connections, and a few mysql ones)

When remote (only mysql), we require SSL in the users database (cannot
be enforced globally)

Also, put pam configurations in a correct state

Fixes https://git.immae.eu/mantisbt/view.php?id=89
Fixes https://git.immae.eu/mantisbt/view.php?id=90
Fixes https://git.immae.eu/mantisbt/view.php?id=88

1 files changed, 4 insertions, 4 deletions

diff --git a/nixops/modules/websites/tools/diaspora/diaspora.nix b/nixops/modules/websites/tools/diaspora/diaspora.nix
index 798ebe6..765c0a5 100644
--- a/nixops/modules/websites/tools/diaspora/diaspora.nix
+++ b/nixops/modules/websites/tools/diaspora/diaspora.nix
@@ -99,9 +99,9 @@ let
   database_config = writeText "database.yml" ''
       postgresql: &postgresql
         adapter: postgresql
-        host: db-1.immae.eu
-        port: 5432
-        username: "diaspora"
+        host: "${env.postgresql.socket}"
+        port: "${env.postgresql.port}"
+        username: "${env.postgresql.user}"
         password: "${env.postgresql.password}"
         encoding: unicode
       common: &common
@@ -113,7 +113,7 @@ let
         database: diaspora_development
       production:
         <<: *combined
-        database: diaspora
+        database: ${env.postgresql.database}
       test:
         <<: *combined
         database: "diaspora_test"