diff options
Diffstat (limited to 'virtual/modules/websites/tools/tools/default.nix')
-rw-r--r-- | virtual/modules/websites/tools/tools/default.nix | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/virtual/modules/websites/tools/tools/default.nix b/virtual/modules/websites/tools/tools/default.nix index f29ac11..d69ccc9 100644 --- a/virtual/modules/websites/tools/tools/default.nix +++ b/virtual/modules/websites/tools/tools/default.nix | |||
@@ -4,6 +4,7 @@ let | |||
4 | ympd = pkgs.callPackage ./ympd.nix {}; | 4 | ympd = pkgs.callPackage ./ympd.nix {}; |
5 | ttrss = pkgs.callPackage ./ttrss.nix { inherit (mylibs) checkEnv fetchedGithub fetchedGit; }; | 5 | ttrss = pkgs.callPackage ./ttrss.nix { inherit (mylibs) checkEnv fetchedGithub fetchedGit; }; |
6 | roundcubemail = pkgs.callPackage ./roundcubemail.nix { inherit (mylibs) checkEnv; }; | 6 | roundcubemail = pkgs.callPackage ./roundcubemail.nix { inherit (mylibs) checkEnv; }; |
7 | wallabag = pkgs.callPackage ./wallabag.nix { inherit (mylibs) checkEnv; }; | ||
7 | 8 | ||
8 | cfg = config.services.myWebsites.tools.tools; | 9 | cfg = config.services.myWebsites.tools.tools; |
9 | in { | 10 | in { |
@@ -18,7 +19,8 @@ in { | |||
18 | adminer.apache.modules | 19 | adminer.apache.modules |
19 | ++ ympd.apache.modules | 20 | ++ ympd.apache.modules |
20 | ++ ttrss.apache.modules | 21 | ++ ttrss.apache.modules |
21 | ++ roundcubemail.apache.modules; | 22 | ++ roundcubemail.apache.modules |
23 | ++ wallabag.apache.modules; | ||
22 | 24 | ||
23 | services.ympd = ympd.config // { enable = false; }; | 25 | services.ympd = ympd.config // { enable = false; }; |
24 | 26 | ||
@@ -31,6 +33,7 @@ in { | |||
31 | ympd.apache.vhostConf | 33 | ympd.apache.vhostConf |
32 | ttrss.apache.vhostConf | 34 | ttrss.apache.vhostConf |
33 | roundcubemail.apache.vhostConf | 35 | roundcubemail.apache.vhostConf |
36 | wallabag.apache.vhostConf | ||
34 | ]; | 37 | ]; |
35 | }; | 38 | }; |
36 | 39 | ||
@@ -38,11 +41,13 @@ in { | |||
38 | adminer = adminer.phpFpm.pool; | 41 | adminer = adminer.phpFpm.pool; |
39 | ttrss = ttrss.phpFpm.pool; | 42 | ttrss = ttrss.phpFpm.pool; |
40 | roundcubemail = roundcubemail.phpFpm.pool; | 43 | roundcubemail = roundcubemail.phpFpm.pool; |
44 | wallabag = wallabag.phpFpm.pool; | ||
41 | }; | 45 | }; |
42 | 46 | ||
43 | system.activationScripts = { | 47 | system.activationScripts = { |
44 | ttrss = ttrss.activationScript; | 48 | ttrss = ttrss.activationScript; |
45 | roundcubemail = roundcubemail.activationScript; | 49 | roundcubemail = roundcubemail.activationScript; |
50 | wallabag = wallabag.activationScript; | ||
46 | }; | 51 | }; |
47 | 52 | ||
48 | systemd.services.tt-rss = { | 53 | systemd.services.tt-rss = { |