Temporarily fix diaspora package

[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 765c0a51ad2a8c5f09a92d5d1b9b36f1c9df0ca3..a57c529b92dff7257c8680f26ea36187853b1929 100644 (file)
--- a/nixops/modules/websites/tools/diaspora/diaspora.nix
+++ b/nixops/modules/websites/tools/diaspora/diaspora.nix
@@ -1,25 +1,34 @@
 { env, fetchedGithub, stdenv, defaultGemConfig, writeText, bundlerEnv, ruby_2_4, pkgs, cacert }:
 let
-  gems = bundlerEnv {
-    name = "diaspora-env";
-    ruby = ruby_2_4;
-    gemdir = ./.;
-    gemConfig = defaultGemConfig // {
-      kostya-sigar = attrs: {
-        buildInputs = with pkgs; [ pkgs.perl ];
-      };
-    };
-  };
   varDir = "/var/lib/diaspora_immae";
   socketsDir = "/run/diaspora";
   diaspora = stdenv.mkDerivation (fetchedGithub ./diaspora.json // rec {
     buildPhase = ''
       patch -p1 < ${./ldap.patch}
+      # FIXME: bundlerEnv below doesn't take postgresql group for some
+      # reason
+      echo 'gem "pg",     "1.1.3"' >> Gemfile
     '';
     installPhase = ''
       cp -a . $out
     '';
   });
+  gems = bundlerEnv {
+    name = "diaspora-env";
+    # https://git.immae.eu/mantisbt/view.php?id=131
+    ruby = ruby_2_4.overrideAttrs(old: {
+      postInstall = builtins.replaceStrings [" --destdir $GEM_HOME"] [""] old.postInstall;
+    });
+    gemfile = "${diaspora}/Gemfile";
+    lockfile = "${diaspora}/Gemfile.lock";
+    gemset = ./gemset.nix;
+    groups = [ "postgresql" "default" "production" ];
+    gemConfig = defaultGemConfig // {
+      kostya-sigar = attrs: {
+        buildInputs = [ pkgs.perl ];
+      };
+    };
+  };
   secret_token = writeText "secret_token.rb" ''
     Diaspora::Application.config.secret_key_base = '${env.secret_token}'
     '';
@@ -69,10 +78,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'
@@ -137,13 +146,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 ];
     };