aboutsummaryrefslogtreecommitdiff
path: root/virtual/modules/websites/tools/mastodon
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/mastodon
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/mastodon')
-rw-r--r--virtual/modules/websites/tools/mastodon/default.nix5
-rw-r--r--virtual/modules/websites/tools/mastodon/mastodon.nix1
2 files changed, 0 insertions, 6 deletions
diff --git a/virtual/modules/websites/tools/mastodon/default.nix b/virtual/modules/websites/tools/mastodon/default.nix
index d25a072..25a389b 100644
--- a/virtual/modules/websites/tools/mastodon/default.nix
+++ b/virtual/modules/websites/tools/mastodon/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.mastodon = 399; 14 ids.uids.mastodon = 399;
17 ids.gids.mastodon = 399; 15 ids.gids.mastodon = 399;
18 16
@@ -96,7 +94,6 @@ in {
96 unitConfig.RequiresMountsFor = mastodon.varDir; 94 unitConfig.RequiresMountsFor = mastodon.varDir;
97 }; 95 };
98 96
99 # FIXME: monitor jobs
100 systemd.services.mastodon-sidekiq = { 97 systemd.services.mastodon-sidekiq = {
101 description = "Mastodon Sidekiq"; 98 description = "Mastodon Sidekiq";
102 wantedBy = [ "multi-user.target" ]; 99 wantedBy = [ "multi-user.target" ];
@@ -124,7 +121,6 @@ in {
124 unitConfig.RequiresMountsFor = mastodon.varDir; 121 unitConfig.RequiresMountsFor = mastodon.varDir;
125 }; 122 };
126 123
127 # FIXME: initial sync
128 system.activationScripts.mastodon = { 124 system.activationScripts.mastodon = {
129 deps = [ "users" ]; 125 deps = [ "users" ];
130 text = '' 126 text = ''
@@ -135,7 +131,6 @@ in {
135 131
136 services.myWebsites.tools.modules = [ 132 services.myWebsites.tools.modules = [
137 "headers" "proxy" "proxy_wstunnel" "proxy_http" "proxy_balancer" 133 "headers" "proxy" "proxy_wstunnel" "proxy_http" "proxy_balancer"
138 # FIXME: probably only one balancer method is needed:
139 "lbmethod_byrequests" "lbmethod_bytraffic" "lbmethod_bybusyness" "lbmethod_heartbeat" 134 "lbmethod_byrequests" "lbmethod_bytraffic" "lbmethod_bybusyness" "lbmethod_heartbeat"
140 ]; 135 ];
141 security.acme.certs."eldiron".extraDomains."mastodon.immae.eu" = null; 136 security.acme.certs."eldiron".extraDomains."mastodon.immae.eu" = null;
diff --git a/virtual/modules/websites/tools/mastodon/mastodon.nix b/virtual/modules/websites/tools/mastodon/mastodon.nix
index 9457a13..e948852 100644
--- a/virtual/modules/websites/tools/mastodon/mastodon.nix
+++ b/virtual/modules/websites/tools/mastodon/mastodon.nix
@@ -2,7 +2,6 @@
2let 2let
3 varDir = "/var/lib/mastodon_immae"; 3 varDir = "/var/lib/mastodon_immae";
4 socketsDir = "/run/mastodon"; 4 socketsDir = "/run/mastodon";
5 # FIXME: use gemsets and nodejs equivalent
6 mastodon = stdenv.mkDerivation (fetchedGithub ./mastodon.json // rec { 5 mastodon = stdenv.mkDerivation (fetchedGithub ./mastodon.json // rec {
7 buildPhase = '' 6 buildPhase = ''
8 export GIT_SSL_CAINFO=${cacert}/etc/ssl/certs/ca-bundle.crt 7 export GIT_SSL_CAINFO=${cacert}/etc/ssl/certs/ca-bundle.crt