From a5365ec3d924a91abdd80c4f58d2158472788de9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Isma=C3=ABl=20Bouya?= Date: Mon, 21 Jan 2019 21:06:33 +0100 Subject: Move all fixmes to mantisbt issue tracking Fixes https://git.immae.eu/mantisbt/view.php?id=111 --- virtual/modules/websites/tools/cloud/nextcloud.nix | 7 ------- virtual/modules/websites/tools/dav/davical.nix | 1 - virtual/modules/websites/tools/db/default.nix | 1 - virtual/modules/websites/tools/diaspora/default.nix | 5 ----- virtual/modules/websites/tools/diaspora/diaspora.nix | 4 ---- virtual/modules/websites/tools/git/default.nix | 1 - virtual/modules/websites/tools/git/mantisbt/mantisbt.nix | 1 - virtual/modules/websites/tools/mastodon/default.nix | 5 ----- virtual/modules/websites/tools/mastodon/mastodon.nix | 1 - virtual/modules/websites/tools/mediagoblin/default.nix | 5 ----- virtual/modules/websites/tools/tools/roundcubemail.nix | 2 -- virtual/modules/websites/tools/tools/ttrss.nix | 2 -- virtual/modules/websites/tools/tools/wallabag.nix | 1 - 13 files changed, 36 deletions(-) (limited to 'virtual/modules/websites/tools') diff --git a/virtual/modules/websites/tools/cloud/nextcloud.nix b/virtual/modules/websites/tools/cloud/nextcloud.nix index 5849774..b9c8d04 100644 --- a/virtual/modules/websites/tools/cloud/nextcloud.nix +++ b/virtual/modules/websites/tools/cloud/nextcloud.nix @@ -1,8 +1,6 @@ { stdenv, fetchurl, checkEnv, writeText, lib, phpPackages, php }: let nextcloud = let - # FIXME: initial sync - # FIXME: backup buildApp = { appName, version, url, sha256, installPhase ? "mkdir -p $out && cp -R . $out/" }: stdenv.mkDerivation rec { name = "nextcloud-app-${appName}-${version}"; @@ -12,11 +10,6 @@ let src = fetchurl { inherit url sha256; }; }; apps = { - # FIXME: nextcloud complains that he cannot write into config - # directory when an app needs upgrade - # /!\ Attention, just changing the version number is not - # sufficient when the downloaded file doesn’t contain the version - # number in it, sha256 needs to be recomputed audioplayer = buildApp rec { appName = "audioplayer"; version = "2.5.0"; diff --git a/virtual/modules/websites/tools/dav/davical.nix b/virtual/modules/websites/tools/dav/davical.nix index 697bd60..cf528ad 100644 --- a/virtual/modules/websites/tools/dav/davical.nix +++ b/virtual/modules/websites/tools/dav/davical.nix @@ -15,7 +15,6 @@ let cp -ra dba docs inc scripts tests $out ''; }; - # FIXME: e-mail sending davical = rec { config = assert checkEnv "NIXOPS_DAVICAL_DB_PASSWORD"; diff --git a/virtual/modules/websites/tools/db/default.nix b/virtual/modules/websites/tools/db/default.nix index 20f77c7..2a82bd6 100644 --- a/virtual/modules/websites/tools/db/default.nix +++ b/virtual/modules/websites/tools/db/default.nix @@ -9,7 +9,6 @@ in { }; config = lib.mkIf cfg.enable { - # FIXME: include it in vhostConf ? security.acme.certs."eldiron".extraDomains."db-1.immae.eu" = null; services.myWebsites.tools.modules = adminer.apache.modules; 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 { }; config = lib.mkIf cfg.enable { - # FIXME: Can we use dynamic users from systemd? - # nixos/modules/misc/ids.nix ids.uids.diaspora = 398; ids.gids.diaspora = 398; @@ -63,8 +61,6 @@ in { unitConfig.RequiresMountsFor = diaspora.varDir; }; - # FIXME: initial sync - # FIXME: touch ${diaspora.varDir}/schedule.yml system.activationScripts.diaspora = { deps = [ "users" ]; text = '' @@ -81,7 +77,6 @@ in { services.myWebsites.tools.modules = [ "headers" "proxy" "proxy_http" "proxy_balancer" - # FIXME: probably only one balancer method is needed: "lbmethod_byrequests" "lbmethod_bytraffic" "lbmethod_bybusyness" "lbmethod_heartbeat" ]; 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 name = "diaspora-env"; ruby = ruby_2_4; gemdir = ./.; - # FIXME: it fails if I don’t include all groups - #groups = [ "default" "postgresql" "production" "development" "test" ]; - # Had to remove them from gemset.nix, and remove mysql2 - # Also had to "ungroup" pg in Gemfile gemConfig = defaultGemConfig // { kostya-sigar = attrs: { buildInputs = with pkgs; [ pkgs.perl ]; diff --git a/virtual/modules/websites/tools/git/default.nix b/virtual/modules/websites/tools/git/default.nix index 0a63013..f53350e 100644 --- a/virtual/modules/websites/tools/git/default.nix +++ b/virtual/modules/websites/tools/git/default.nix @@ -10,7 +10,6 @@ in { }; config = lib.mkIf cfg.enable { - # FIXME: include it in vhostConf ? security.acme.certs."eldiron".extraDomains."git.immae.eu" = null; nixpkgs.config.packageOverrides = oldpkgs: rec { diff --git a/virtual/modules/websites/tools/git/mantisbt/mantisbt.nix b/virtual/modules/websites/tools/git/mantisbt/mantisbt.nix index 009c902..c1cb60d 100644 --- a/virtual/modules/websites/tools/git/mantisbt/mantisbt.nix +++ b/virtual/modules/websites/tools/git/mantisbt/mantisbt.nix @@ -1,6 +1,5 @@ { lib, checkEnv, writeText, stdenv, fetchurl, fetchedGithub }: let - # FIXME: check that source-integration and slack still work mantisbt = let plugins = { slack = stdenv.mkDerivation (fetchedGithub ./mantisbt-plugin-slack.json // rec { 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 { }; config = lib.mkIf cfg.enable { - # FIXME: Can we use dynamic users from systemd? - # nixos/modules/misc/ids.nix ids.uids.mastodon = 399; ids.gids.mastodon = 399; @@ -96,7 +94,6 @@ in { unitConfig.RequiresMountsFor = mastodon.varDir; }; - # FIXME: monitor jobs systemd.services.mastodon-sidekiq = { description = "Mastodon Sidekiq"; wantedBy = [ "multi-user.target" ]; @@ -124,7 +121,6 @@ in { unitConfig.RequiresMountsFor = mastodon.varDir; }; - # FIXME: initial sync system.activationScripts.mastodon = { deps = [ "users" ]; text = '' @@ -135,7 +131,6 @@ in { services.myWebsites.tools.modules = [ "headers" "proxy" "proxy_wstunnel" "proxy_http" "proxy_balancer" - # FIXME: probably only one balancer method is needed: "lbmethod_byrequests" "lbmethod_bytraffic" "lbmethod_bybusyness" "lbmethod_heartbeat" ]; 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 @@ let varDir = "/var/lib/mastodon_immae"; socketsDir = "/run/mastodon"; - # FIXME: use gemsets and nodejs equivalent mastodon = stdenv.mkDerivation (fetchedGithub ./mastodon.json // rec { buildPhase = '' export GIT_SSL_CAINFO=${cacert}/etc/ssl/certs/ca-bundle.crt diff --git a/virtual/modules/websites/tools/mediagoblin/default.nix b/virtual/modules/websites/tools/mediagoblin/default.nix index 388f6b3..99bdce1 100644 --- a/virtual/modules/websites/tools/mediagoblin/default.nix +++ b/virtual/modules/websites/tools/mediagoblin/default.nix @@ -11,8 +11,6 @@ in { }; config = lib.mkIf cfg.enable { - # FIXME: Can we use dynamic users from systemd? - # nixos/modules/misc/ids.nix ids.uids.mediagoblin = 397; ids.gids.mediagoblin = 397; @@ -89,8 +87,6 @@ in { unitConfig.RequiresMountsFor = mediagoblin.varDir; }; - # FIXME: background jobs and upload - # FIXME: initial sync system.activationScripts.mediagoblin = { deps = [ "users" ]; text = '' @@ -105,7 +101,6 @@ in { services.myWebsites.tools.modules = [ "proxy" "proxy_http" "proxy_balancer" - # FIXME: probably only one balancer method is needed: "lbmethod_byrequests" "lbmethod_bytraffic" "lbmethod_bybusyness" "lbmethod_heartbeat" ]; users.users.wwwrun.extraGroups = [ "mediagoblin" ]; diff --git a/virtual/modules/websites/tools/tools/roundcubemail.nix b/virtual/modules/websites/tools/tools/roundcubemail.nix index 1aa2d87..e1653ae 100644 --- a/virtual/modules/websites/tools/tools/roundcubemail.nix +++ b/virtual/modules/websites/tools/tools/roundcubemail.nix @@ -4,7 +4,6 @@ let plugins = {}; in rec { varDir = "/var/lib/roundcubemail"; - # FIXME: initial sync activationScript = { deps = [ "wrappers" ]; text = '' @@ -14,7 +13,6 @@ let ''; }; config = - # FIXME: LOG_DESTINATION syslog? assert checkEnv "NIXOPS_ROUNDCUBEMAIL_PSQL_URL"; assert checkEnv "NIXOPS_ROUNDCUBEMAIL_SECRET"; writeText "config.php" '' diff --git a/virtual/modules/websites/tools/tools/ttrss.nix b/virtual/modules/websites/tools/tools/ttrss.nix index f7b0f61..2659afd 100644 --- a/virtual/modules/websites/tools/tools/ttrss.nix +++ b/virtual/modules/websites/tools/tools/ttrss.nix @@ -37,7 +37,6 @@ let }; in rec { varDir = "/var/lib/ttrss"; - # FIXME: initial sync activationScript = { deps = [ "wrappers" ]; text = '' @@ -54,7 +53,6 @@ let ''; }; config = - # FIXME: LOG_DESTINATION syslog? assert checkEnv "NIXOPS_TTRSS_DB_PASSWORD"; assert checkEnv "NIXOPS_TTRSS_LDAP_PASSWORD"; writeText "config.php" '' diff --git a/virtual/modules/websites/tools/tools/wallabag.nix b/virtual/modules/websites/tools/tools/wallabag.nix index 92787b8..0b54fff 100644 --- a/virtual/modules/websites/tools/tools/wallabag.nix +++ b/virtual/modules/websites/tools/tools/wallabag.nix @@ -103,7 +103,6 @@ let group = "wwwrun"; modules = [ "proxy_fcgi" ]; vhostConf = '' - # FIXME Alias /assets "${varDir}/assets" Alias /wallabag "${webRoot}" -- cgit v1.2.3