diff options
author | Ismaël Bouya <ismael.bouya@normalesup.org> | 2019-01-25 14:21:34 +0100 |
---|---|---|
committer | Ismaël Bouya <ismael.bouya@normalesup.org> | 2019-01-25 14:21:34 +0100 |
commit | bfe3c9c9df0c5112bc8806483292b55ed0f7e02d (patch) | |
tree | f5b9ffbdab585a99f33feb4f719ae54edd1539db /virtual/modules/websites/tools/tools/default.nix | |
parent | 133ebaee701a52a74fc6897498f44f006ea3c3d8 (diff) | |
download | Nix-bfe3c9c9df0c5112bc8806483292b55ed0f7e02d.tar.gz Nix-bfe3c9c9df0c5112bc8806483292b55ed0f7e02d.tar.zst Nix-bfe3c9c9df0c5112bc8806483292b55ed0f7e02d.zip |
Add rompr
Fixes https://git.immae.eu/mantisbt/view.php?id=70
Diffstat (limited to 'virtual/modules/websites/tools/tools/default.nix')
-rw-r--r-- | virtual/modules/websites/tools/tools/default.nix | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/virtual/modules/websites/tools/tools/default.nix b/virtual/modules/websites/tools/tools/default.nix index 7fb4974..333ffb0 100644 --- a/virtual/modules/websites/tools/tools/default.nix +++ b/virtual/modules/websites/tools/tools/default.nix | |||
@@ -1,7 +1,9 @@ | |||
1 | { lib, pkgs, config, myconfig, mylibs, ... }: | 1 | { lib, pkgs, config, myconfig, mylibs, ... }: |
2 | let | 2 | let |
3 | adminer = pkgs.callPackage ../../commons/adminer.nix {}; | 3 | adminer = pkgs.callPackage ../../commons/adminer.nix {}; |
4 | ympd = pkgs.callPackage ./ympd.nix {}; | 4 | ympd = pkgs.callPackage ./ympd.nix { |
5 | env = myconfig.env.tools.ympd; | ||
6 | }; | ||
5 | ttrss = pkgs.callPackage ./ttrss.nix { | 7 | ttrss = pkgs.callPackage ./ttrss.nix { |
6 | inherit (mylibs) fetchedGithub fetchedGit; | 8 | inherit (mylibs) fetchedGithub fetchedGit; |
7 | env = myconfig.env.tools.ttrss; | 9 | env = myconfig.env.tools.ttrss; |
@@ -12,6 +14,10 @@ let | |||
12 | inherit (mylibs) fetchedGithub; | 14 | inherit (mylibs) fetchedGithub; |
13 | env = myconfig.env.tools.yourls; | 15 | env = myconfig.env.tools.yourls; |
14 | }; | 16 | }; |
17 | rompr = pkgs.callPackage ./rompr.nix { | ||
18 | inherit (mylibs) fetchedGithub; | ||
19 | env = myconfig.env.tools.rompr; | ||
20 | }; | ||
15 | 21 | ||
16 | cfg = config.services.myWebsites.tools.tools; | 22 | cfg = config.services.myWebsites.tools.tools; |
17 | in { | 23 | in { |
@@ -28,9 +34,10 @@ in { | |||
28 | ++ ttrss.apache.modules | 34 | ++ ttrss.apache.modules |
29 | ++ roundcubemail.apache.modules | 35 | ++ roundcubemail.apache.modules |
30 | ++ wallabag.apache.modules | 36 | ++ wallabag.apache.modules |
31 | ++ yourls.apache.modules; | 37 | ++ yourls.apache.modules |
38 | ++ rompr.apache.modules; | ||
32 | 39 | ||
33 | services.ympd = ympd.config // { enable = false; }; | 40 | services.ympd = ympd.config // { enable = true; }; |
34 | 41 | ||
35 | services.myWebsites.tools.vhostConfs.tools = { | 42 | services.myWebsites.tools.vhostConfs.tools = { |
36 | certName = "eldiron"; | 43 | certName = "eldiron"; |
@@ -43,6 +50,7 @@ in { | |||
43 | roundcubemail.apache.vhostConf | 50 | roundcubemail.apache.vhostConf |
44 | wallabag.apache.vhostConf | 51 | wallabag.apache.vhostConf |
45 | yourls.apache.vhostConf | 52 | yourls.apache.vhostConf |
53 | rompr.apache.vhostConf | ||
46 | ]; | 54 | ]; |
47 | }; | 55 | }; |
48 | 56 | ||
@@ -52,6 +60,7 @@ in { | |||
52 | roundcubemail = roundcubemail.phpFpm.pool; | 60 | roundcubemail = roundcubemail.phpFpm.pool; |
53 | wallabag = wallabag.phpFpm.pool; | 61 | wallabag = wallabag.phpFpm.pool; |
54 | yourls = yourls.phpFpm.pool; | 62 | yourls = yourls.phpFpm.pool; |
63 | rompr = rompr.phpFpm.pool; | ||
55 | }; | 64 | }; |
56 | 65 | ||
57 | system.activationScripts = { | 66 | system.activationScripts = { |
@@ -59,6 +68,7 @@ in { | |||
59 | roundcubemail = roundcubemail.activationScript; | 68 | roundcubemail = roundcubemail.activationScript; |
60 | wallabag = wallabag.activationScript; | 69 | wallabag = wallabag.activationScript; |
61 | yourls = yourls.activationScript; | 70 | yourls = yourls.activationScript; |
71 | rompr = rompr.activationScript; | ||
62 | }; | 72 | }; |
63 | 73 | ||
64 | systemd.services.tt-rss = { | 74 | systemd.services.tt-rss = { |