aboutsummaryrefslogtreecommitdiff
path: root/nixops/modules
diff options
context:
space:
mode:
Diffstat (limited to 'nixops/modules')
-rw-r--r--nixops/modules/websites/tools/tools/default.nix5
-rw-r--r--nixops/modules/websites/tools/tools/roundcubemail.nix9
2 files changed, 11 insertions, 3 deletions
diff --git a/nixops/modules/websites/tools/tools/default.nix b/nixops/modules/websites/tools/tools/default.nix
index b1fd8f2..8edbdd9 100644
--- a/nixops/modules/websites/tools/tools/default.nix
+++ b/nixops/modules/websites/tools/tools/default.nix
@@ -8,7 +8,10 @@ let
8 inherit (mylibs) fetchedGithub fetchedGit; 8 inherit (mylibs) fetchedGithub fetchedGit;
9 env = myconfig.env.tools.ttrss; 9 env = myconfig.env.tools.ttrss;
10 }; 10 };
11 roundcubemail = pkgs.callPackage ./roundcubemail.nix { env = myconfig.env.tools.roundcubemail; }; 11 roundcubemail = pkgs.callPackage ./roundcubemail.nix {
12 inherit (mylibs) fetchedGithub;
13 env = myconfig.env.tools.roundcubemail;
14 };
12 rainloop = pkgs.callPackage ./rainloop.nix {}; 15 rainloop = pkgs.callPackage ./rainloop.nix {};
13 kanboard = pkgs.callPackage ./kanboard.nix { 16 kanboard = pkgs.callPackage ./kanboard.nix {
14 inherit (mylibs) fetchedGithub; 17 inherit (mylibs) fetchedGithub;
diff --git a/nixops/modules/websites/tools/tools/roundcubemail.nix b/nixops/modules/websites/tools/tools/roundcubemail.nix
index c0a1125..58a1be5 100644
--- a/nixops/modules/websites/tools/tools/roundcubemail.nix
+++ b/nixops/modules/websites/tools/tools/roundcubemail.nix
@@ -1,7 +1,8 @@
1{ lib, env, writeText, stdenv, fetchurl }: 1{ lib, env, writeText, stdenv, fetchurl, fetchedGithub }:
2let 2let
3 roundcubemail = let 3 roundcubemail = let
4 plugins = {}; 4 plugins = {};
5 skins = {};
5 in rec { 6 in rec {
6 varDir = "/var/lib/roundcubemail"; 7 varDir = "/var/lib/roundcubemail";
7 activationScript = { 8 activationScript = {
@@ -59,6 +60,9 @@ let
59 ${builtins.concatStringsSep "\n" ( 60 ${builtins.concatStringsSep "\n" (
60 lib.attrsets.mapAttrsToList (name: value: "ln -sf ${value} $out/plugins/${name}") plugins 61 lib.attrsets.mapAttrsToList (name: value: "ln -sf ${value} $out/plugins/${name}") plugins
61 )} 62 )}
63 ${builtins.concatStringsSep "\n" (
64 lib.attrsets.mapAttrsToList (name: value: "ln -sf ${value} $out/skins/${name}") skins
65 )}
62 ''; 66 '';
63 }; 67 };
64 apache = rec { 68 apache = rec {
@@ -84,7 +88,8 @@ let
84 phpFpm = rec { 88 phpFpm = rec {
85 basedir = builtins.concatStringsSep ":" ( 89 basedir = builtins.concatStringsSep ":" (
86 [ webRoot config varDir ] 90 [ webRoot config varDir ]
87 ++ lib.attrsets.mapAttrsToList (name: value: value) plugins); 91 ++ lib.attrsets.mapAttrsToList (name: value: value) plugins
92 ++ lib.attrsets.mapAttrsToList (name: value: value) skins);
88 socket = "/var/run/phpfpm/roundcubemail.sock"; 93 socket = "/var/run/phpfpm/roundcubemail.sock";
89 pool = '' 94 pool = ''
90 listen = ${socket} 95 listen = ${socket}