diff options
Diffstat (limited to 'virtual/modules/websites/tools')
13 files changed, 0 insertions, 36 deletions
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 @@ | |||
1 | { stdenv, fetchurl, checkEnv, writeText, lib, phpPackages, php }: | 1 | { stdenv, fetchurl, checkEnv, writeText, lib, phpPackages, php }: |
2 | let | 2 | let |
3 | nextcloud = let | 3 | nextcloud = let |
4 | # FIXME: initial sync | ||
5 | # FIXME: backup | ||
6 | buildApp = { appName, version, url, sha256, installPhase ? "mkdir -p $out && cp -R . $out/" }: | 4 | buildApp = { appName, version, url, sha256, installPhase ? "mkdir -p $out && cp -R . $out/" }: |
7 | stdenv.mkDerivation rec { | 5 | stdenv.mkDerivation rec { |
8 | name = "nextcloud-app-${appName}-${version}"; | 6 | name = "nextcloud-app-${appName}-${version}"; |
@@ -12,11 +10,6 @@ let | |||
12 | src = fetchurl { inherit url sha256; }; | 10 | src = fetchurl { inherit url sha256; }; |
13 | }; | 11 | }; |
14 | apps = { | 12 | apps = { |
15 | # FIXME: nextcloud complains that he cannot write into config | ||
16 | # directory when an app needs upgrade | ||
17 | # /!\ Attention, just changing the version number is not | ||
18 | # sufficient when the downloaded file doesn’t contain the version | ||
19 | # number in it, sha256 needs to be recomputed | ||
20 | audioplayer = buildApp rec { | 13 | audioplayer = buildApp rec { |
21 | appName = "audioplayer"; | 14 | appName = "audioplayer"; |
22 | version = "2.5.0"; | 15 | 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 | |||
15 | cp -ra dba docs inc scripts tests $out | 15 | cp -ra dba docs inc scripts tests $out |
16 | ''; | 16 | ''; |
17 | }; | 17 | }; |
18 | # FIXME: e-mail sending | ||
19 | davical = rec { | 18 | davical = rec { |
20 | config = | 19 | config = |
21 | assert checkEnv "NIXOPS_DAVICAL_DB_PASSWORD"; | 20 | 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 { | |||
9 | }; | 9 | }; |
10 | 10 | ||
11 | config = lib.mkIf cfg.enable { | 11 | config = lib.mkIf cfg.enable { |
12 | # FIXME: include it in vhostConf ? | ||
13 | security.acme.certs."eldiron".extraDomains."db-1.immae.eu" = null; | 12 | security.acme.certs."eldiron".extraDomains."db-1.immae.eu" = null; |
14 | 13 | ||
15 | services.myWebsites.tools.modules = adminer.apache.modules; | 14 | 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 { | |||
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 ]; |
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 { | |||
10 | }; | 10 | }; |
11 | 11 | ||
12 | config = lib.mkIf cfg.enable { | 12 | config = lib.mkIf cfg.enable { |
13 | # FIXME: include it in vhostConf ? | ||
14 | security.acme.certs."eldiron".extraDomains."git.immae.eu" = null; | 13 | security.acme.certs."eldiron".extraDomains."git.immae.eu" = null; |
15 | 14 | ||
16 | nixpkgs.config.packageOverrides = oldpkgs: rec { | 15 | 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 @@ | |||
1 | { lib, checkEnv, writeText, stdenv, fetchurl, fetchedGithub }: | 1 | { lib, checkEnv, writeText, stdenv, fetchurl, fetchedGithub }: |
2 | let | 2 | let |
3 | # FIXME: check that source-integration and slack still work | ||
4 | mantisbt = let | 3 | mantisbt = let |
5 | plugins = { | 4 | plugins = { |
6 | slack = stdenv.mkDerivation (fetchedGithub ./mantisbt-plugin-slack.json // rec { | 5 | 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 { | |||
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 @@ | |||
2 | let | 2 | let |
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 |
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 { | |||
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.mediagoblin = 397; | 14 | ids.uids.mediagoblin = 397; |
17 | ids.gids.mediagoblin = 397; | 15 | ids.gids.mediagoblin = 397; |
18 | 16 | ||
@@ -89,8 +87,6 @@ in { | |||
89 | unitConfig.RequiresMountsFor = mediagoblin.varDir; | 87 | unitConfig.RequiresMountsFor = mediagoblin.varDir; |
90 | }; | 88 | }; |
91 | 89 | ||
92 | # FIXME: background jobs and upload | ||
93 | # FIXME: initial sync | ||
94 | system.activationScripts.mediagoblin = { | 90 | system.activationScripts.mediagoblin = { |
95 | deps = [ "users" ]; | 91 | deps = [ "users" ]; |
96 | text = '' | 92 | text = '' |
@@ -105,7 +101,6 @@ in { | |||
105 | 101 | ||
106 | services.myWebsites.tools.modules = [ | 102 | services.myWebsites.tools.modules = [ |
107 | "proxy" "proxy_http" "proxy_balancer" | 103 | "proxy" "proxy_http" "proxy_balancer" |
108 | # FIXME: probably only one balancer method is needed: | ||
109 | "lbmethod_byrequests" "lbmethod_bytraffic" "lbmethod_bybusyness" "lbmethod_heartbeat" | 104 | "lbmethod_byrequests" "lbmethod_bytraffic" "lbmethod_bybusyness" "lbmethod_heartbeat" |
110 | ]; | 105 | ]; |
111 | users.users.wwwrun.extraGroups = [ "mediagoblin" ]; | 106 | 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 | |||
4 | plugins = {}; | 4 | plugins = {}; |
5 | in rec { | 5 | in rec { |
6 | varDir = "/var/lib/roundcubemail"; | 6 | varDir = "/var/lib/roundcubemail"; |
7 | # FIXME: initial sync | ||
8 | activationScript = { | 7 | activationScript = { |
9 | deps = [ "wrappers" ]; | 8 | deps = [ "wrappers" ]; |
10 | text = '' | 9 | text = '' |
@@ -14,7 +13,6 @@ let | |||
14 | ''; | 13 | ''; |
15 | }; | 14 | }; |
16 | config = | 15 | config = |
17 | # FIXME: LOG_DESTINATION syslog? | ||
18 | assert checkEnv "NIXOPS_ROUNDCUBEMAIL_PSQL_URL"; | 16 | assert checkEnv "NIXOPS_ROUNDCUBEMAIL_PSQL_URL"; |
19 | assert checkEnv "NIXOPS_ROUNDCUBEMAIL_SECRET"; | 17 | assert checkEnv "NIXOPS_ROUNDCUBEMAIL_SECRET"; |
20 | writeText "config.php" '' | 18 | 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 | |||
37 | }; | 37 | }; |
38 | in rec { | 38 | in rec { |
39 | varDir = "/var/lib/ttrss"; | 39 | varDir = "/var/lib/ttrss"; |
40 | # FIXME: initial sync | ||
41 | activationScript = { | 40 | activationScript = { |
42 | deps = [ "wrappers" ]; | 41 | deps = [ "wrappers" ]; |
43 | text = '' | 42 | text = '' |
@@ -54,7 +53,6 @@ let | |||
54 | ''; | 53 | ''; |
55 | }; | 54 | }; |
56 | config = | 55 | config = |
57 | # FIXME: LOG_DESTINATION syslog? | ||
58 | assert checkEnv "NIXOPS_TTRSS_DB_PASSWORD"; | 56 | assert checkEnv "NIXOPS_TTRSS_DB_PASSWORD"; |
59 | assert checkEnv "NIXOPS_TTRSS_LDAP_PASSWORD"; | 57 | assert checkEnv "NIXOPS_TTRSS_LDAP_PASSWORD"; |
60 | writeText "config.php" '' | 58 | 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 | |||
103 | group = "wwwrun"; | 103 | group = "wwwrun"; |
104 | modules = [ "proxy_fcgi" ]; | 104 | modules = [ "proxy_fcgi" ]; |
105 | vhostConf = '' | 105 | vhostConf = '' |
106 | # FIXME | ||
107 | Alias /assets "${varDir}/assets" | 106 | Alias /assets "${varDir}/assets" |
108 | Alias /wallabag "${webRoot}" | 107 | Alias /wallabag "${webRoot}" |
109 | <Directory "${webRoot}"> | 108 | <Directory "${webRoot}"> |