Remove useless relative symlinks

[perso/Immae/Config/Nix.git] / nixops / modules / websites / tools / diaspora / diaspora.nix

diff --git a/nixops/modules/websites/tools/diaspora/diaspora.nix b/nixops/modules/websites/tools/diaspora/diaspora.nix
index 798ebe6707d22a4b6245a8b3e0815710d3e7f77e..778fe267f415e494914b4d6ffc8bcbd59c757c6b 100644 (file)
--- a/nixops/modules/websites/tools/diaspora/diaspora.nix
+++ b/nixops/modules/websites/tools/diaspora/diaspora.nix
@@ -69,10 +69,10 @@ let
         mail:
           enable: true
           sender_address: 'diaspora@immae.eu'
-          method: 'smtp'
+          method: 'sendmail'
           smtp:
-            host: 'mail.immae.eu'
           sendmail:
+            location: '/run/wrappers/bin/sendmail'
         admins:
           account: "ismael"
           podmin_email: 'diaspora@immae.eu'
@@ -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"
@@ -137,13 +137,13 @@ let
         ln -s ${database_config} config/database.yml
         ln -s ${config} config/diaspora.yml
         ln -s ${secret_token} config/initializers/secret_token.rb
-        ln -sf ../../../../../../${varDir}/schedule.yml config/schedule.yml
-        ln -sf ../../../../../../${varDir}/oidc_key.pem config/oidc_key.pem
-        ln -sf ../../../../../../${varDir}/uploads public/uploads
+        ln -sf ${varDir}/schedule.yml config/schedule.yml
+        ln -sf ${varDir}/oidc_key.pem config/oidc_key.pem
+        ln -sf ${varDir}/uploads public/uploads
         RAILS_ENV=production ${gems}/bin/rake assets:precompile
         rm -rf tmp log
-        ln -sf ../../../../../${varDir}/tmp tmp
-        ln -sf ../../../../../${varDir}/log log
+        ln -sf ${varDir}/tmp tmp
+        ln -sf ${varDir}/log log
         '';
       propagatedBuildInputs = [ gems pkgs.nodejs pkgs.which pkgs.git ];
     };