aboutsummaryrefslogtreecommitdiff
path: root/virtual/modules/websites/tools/diaspora
diff options
context:
space:
mode:
authorIsmaël Bouya <ismael.bouya@normalesup.org>2019-01-21 21:06:33 +0100
committerIsmaël Bouya <ismael.bouya@normalesup.org>2019-01-21 21:06:33 +0100
commita5365ec3d924a91abdd80c4f58d2158472788de9 (patch)
treefbcda39758dc703f0c73fd1e7b224e4675c61edb /virtual/modules/websites/tools/diaspora
parent7fff3ab2628284e7f53bee04401621f4c0963b4f (diff)
downloadNix-a5365ec3d924a91abdd80c4f58d2158472788de9.tar.gz
Nix-a5365ec3d924a91abdd80c4f58d2158472788de9.tar.zst
Nix-a5365ec3d924a91abdd80c4f58d2158472788de9.zip
Move all fixmes to mantisbt issue tracking
Fixes https://git.immae.eu/mantisbt/view.php?id=111
Diffstat (limited to 'virtual/modules/websites/tools/diaspora')
-rw-r--r--virtual/modules/websites/tools/diaspora/default.nix5
-rw-r--r--virtual/modules/websites/tools/diaspora/diaspora.nix4
2 files changed, 0 insertions, 9 deletions
diff --git a/virtual/modules/websites/tools/diaspora/default.nix b/virtual/modules/websites/tools/diaspora/default.nix
index 23670dc..8285d6c 100644
--- a/virtual/modules/websites/tools/diaspora/default.nix
+++ b/virtual/modules/websites/tools/diaspora/default.nix
@@ -11,8 +11,6 @@ in {
11 }; 11 };
12 12
13 config = lib.mkIf cfg.enable { 13 config = lib.mkIf cfg.enable {
14 # FIXME: Can we use dynamic users from systemd?
15 # nixos/modules/misc/ids.nix
16 ids.uids.diaspora = 398; 14 ids.uids.diaspora = 398;
17 ids.gids.diaspora = 398; 15 ids.gids.diaspora = 398;
18 16
@@ -63,8 +61,6 @@ in {
63 unitConfig.RequiresMountsFor = diaspora.varDir; 61 unitConfig.RequiresMountsFor = diaspora.varDir;
64 }; 62 };
65 63
66 # FIXME: initial sync
67 # FIXME: touch ${diaspora.varDir}/schedule.yml
68 system.activationScripts.diaspora = { 64 system.activationScripts.diaspora = {
69 deps = [ "users" ]; 65 deps = [ "users" ];
70 text = '' 66 text = ''
@@ -81,7 +77,6 @@ in {
81 77
82 services.myWebsites.tools.modules = [ 78 services.myWebsites.tools.modules = [
83 "headers" "proxy" "proxy_http" "proxy_balancer" 79 "headers" "proxy" "proxy_http" "proxy_balancer"
84 # FIXME: probably only one balancer method is needed:
85 "lbmethod_byrequests" "lbmethod_bytraffic" "lbmethod_bybusyness" "lbmethod_heartbeat" 80 "lbmethod_byrequests" "lbmethod_bytraffic" "lbmethod_bybusyness" "lbmethod_heartbeat"
86 ]; 81 ];
87 security.acme.certs."eldiron".extraDomains."diaspora.immae.eu" = null; 82 security.acme.certs."eldiron".extraDomains."diaspora.immae.eu" = null;
diff --git a/virtual/modules/websites/tools/diaspora/diaspora.nix b/virtual/modules/websites/tools/diaspora/diaspora.nix
index 7880ac5..961e1f8 100644
--- a/virtual/modules/websites/tools/diaspora/diaspora.nix
+++ b/virtual/modules/websites/tools/diaspora/diaspora.nix
@@ -4,10 +4,6 @@ let
4 name = "diaspora-env"; 4 name = "diaspora-env";
5 ruby = ruby_2_4; 5 ruby = ruby_2_4;
6 gemdir = ./.; 6 gemdir = ./.;
7 # FIXME: it fails if I don’t include all groups
8 #groups = [ "default" "postgresql" "production" "development" "test" ];
9 # Had to remove them from gemset.nix, and remove mysql2
10 # Also had to "ungroup" pg in Gemfile
11 gemConfig = defaultGemConfig // { 7 gemConfig = defaultGemConfig // {
12 kostya-sigar = attrs: { 8 kostya-sigar = attrs: {
13 buildInputs = with pkgs; [ pkgs.perl ]; 9 buildInputs = with pkgs; [ pkgs.perl ];