diff options
Diffstat (limited to 'virtual/modules/websites/tools')
-rw-r--r-- | virtual/modules/websites/tools/diaspora/default.nix | 2 | ||||
-rw-r--r-- | virtual/modules/websites/tools/diaspora/diaspora.nix | 12 |
2 files changed, 2 insertions, 12 deletions
diff --git a/virtual/modules/websites/tools/diaspora/default.nix b/virtual/modules/websites/tools/diaspora/default.nix index b15b9ce..ae870b0 100644 --- a/virtual/modules/websites/tools/diaspora/default.nix +++ b/virtual/modules/websites/tools/diaspora/default.nix | |||
@@ -34,7 +34,7 @@ in { | |||
34 | wants = [ "redis.service" "postgresql.service" ]; | 34 | wants = [ "redis.service" "postgresql.service" ]; |
35 | 35 | ||
36 | environment.RAILS_ENV = "production"; | 36 | environment.RAILS_ENV = "production"; |
37 | environment.BUNDLE_PATH = "${diaspora.gems}/lib/ruby/gems/2.4.0"; | 37 | environment.BUNDLE_PATH = "${diaspora.gems}/${diaspora.gems.ruby.gemPath}"; |
38 | environment.BUNDLE_GEMFILE = "${diaspora.gems.confFiles}/Gemfile"; | 38 | environment.BUNDLE_GEMFILE = "${diaspora.gems.confFiles}/Gemfile"; |
39 | environment.EYE_SOCK = "${diaspora.socketsDir}/eye.sock"; | 39 | environment.EYE_SOCK = "${diaspora.socketsDir}/eye.sock"; |
40 | environment.EYE_PID = "${diaspora.socketsDir}/eye.pid"; | 40 | environment.EYE_PID = "${diaspora.socketsDir}/eye.pid"; |
diff --git a/virtual/modules/websites/tools/diaspora/diaspora.nix b/virtual/modules/websites/tools/diaspora/diaspora.nix index e067253..be3e426 100644 --- a/virtual/modules/websites/tools/diaspora/diaspora.nix +++ b/virtual/modules/websites/tools/diaspora/diaspora.nix | |||
@@ -12,23 +12,13 @@ let | |||
12 | }; | 12 | }; |
13 | varDir = "/var/lib/diaspora_immae"; | 13 | varDir = "/var/lib/diaspora_immae"; |
14 | socketsDir = "/run/diaspora"; | 14 | socketsDir = "/run/diaspora"; |
15 | buildInputs = [ gems ] ++ (with pkgs; [ | ||
16 | git redis imagemagick libxslt nodejs | ||
17 | jemalloc cacert ruby_2_4 | ||
18 | openssl postgresql curl libnghttp2 | ||
19 | pkgconfig which | ||
20 | ]); | ||
21 | diaspora = stdenv.mkDerivation (fetchedGithub ./diaspora.json // rec { | 15 | diaspora = stdenv.mkDerivation (fetchedGithub ./diaspora.json // rec { |
22 | buildPhase = '' | 16 | buildPhase = '' |
23 | export GIT_SSL_CAINFO=${cacert}/etc/ssl/certs/ca-bundle.crt | ||
24 | export SSL_CERT_FILE=${cacert}/etc/ssl/certs/ca-bundle.crt | ||
25 | |||
26 | patch -p1 < ${./ldap.patch} | 17 | patch -p1 < ${./ldap.patch} |
27 | ''; | 18 | ''; |
28 | installPhase = '' | 19 | installPhase = '' |
29 | cp -a . $out | 20 | cp -a . $out |
30 | ''; | 21 | ''; |
31 | propagatedBuildInputs = buildInputs; | ||
32 | }); | 22 | }); |
33 | secret_token = writeText "secret_token.rb" '' | 23 | secret_token = writeText "secret_token.rb" '' |
34 | Diaspora::Application.config.secret_key_base = '${env.secret_token}' | 24 | Diaspora::Application.config.secret_key_base = '${env.secret_token}' |
@@ -155,7 +145,7 @@ let | |||
155 | ln -sf ../../../../../${varDir}/tmp tmp | 145 | ln -sf ../../../../../${varDir}/tmp tmp |
156 | ln -sf ../../../../../${varDir}/log log | 146 | ln -sf ../../../../../${varDir}/log log |
157 | ''; | 147 | ''; |
158 | propagatedBuildInputs = buildInputs; | 148 | propagatedBuildInputs = [ gems pkgs.nodejs pkgs.which pkgs.git ]; |
159 | }; | 149 | }; |
160 | in | 150 | in |
161 | { | 151 | { |