diff options
Diffstat (limited to 'virtual/eldiron.nix')
-rw-r--r-- | virtual/eldiron.nix | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/virtual/eldiron.nix b/virtual/eldiron.nix index 2152aff..172b369 100644 --- a/virtual/eldiron.nix +++ b/virtual/eldiron.nix | |||
@@ -256,6 +256,7 @@ | |||
256 | nextcloud = mypkgs.nextcloud.phpFpm.pool; | 256 | nextcloud = mypkgs.nextcloud.phpFpm.pool; |
257 | mantisbt = mypkgs.mantisbt.phpFpm.pool; | 257 | mantisbt = mypkgs.mantisbt.phpFpm.pool; |
258 | ttrss = mypkgs.ttrss.phpFpm.pool; | 258 | ttrss = mypkgs.ttrss.phpFpm.pool; |
259 | roundcubemail = mypkgs.roundcubemail.phpFpm.pool; | ||
259 | }; | 260 | }; |
260 | }; | 261 | }; |
261 | 262 | ||
@@ -272,6 +273,7 @@ | |||
272 | aten_prod = mypkgs.aten_prod.activationScript; | 273 | aten_prod = mypkgs.aten_prod.activationScript; |
273 | nextcloud = mypkgs.nextcloud.activationScript; | 274 | nextcloud = mypkgs.nextcloud.activationScript; |
274 | ttrss = mypkgs.ttrss.activationScript; | 275 | ttrss = mypkgs.ttrss.activationScript; |
276 | roundcubemail = mypkgs.roundcubemail.activationScript; | ||
275 | httpd = '' | 277 | httpd = '' |
276 | install -d -m 0755 /var/lib/acme/acme-challenge | 278 | install -d -m 0755 /var/lib/acme/acme-challenge |
277 | install -d -m 0750 -o wwwrun -g wwwrun /var/lib/php/sessions | 279 | install -d -m 0750 -o wwwrun -g wwwrun /var/lib/php/sessions |
@@ -432,6 +434,7 @@ | |||
432 | mypkgs.git.web.apache.modules ++ | 434 | mypkgs.git.web.apache.modules ++ |
433 | mypkgs.mantisbt.apache.modules ++ | 435 | mypkgs.mantisbt.apache.modules ++ |
434 | mypkgs.ttrss.apache.modules ++ | 436 | mypkgs.ttrss.apache.modules ++ |
437 | mypkgs.roundcubemail.apache.modules ++ | ||
435 | pkgs.lib.lists.flatten (pkgs.lib.attrsets.mapAttrsToList (n: v: v.modules) apacheConfig) ++ | 438 | pkgs.lib.lists.flatten (pkgs.lib.attrsets.mapAttrsToList (n: v: v.modules) apacheConfig) ++ |
436 | [ "macro" ]); | 439 | [ "macro" ]); |
437 | extraConfig = builtins.concatStringsSep "\n" | 440 | extraConfig = builtins.concatStringsSep "\n" |
@@ -458,6 +461,7 @@ | |||
458 | mypkgs.adminer.apache.vhostConf | 461 | mypkgs.adminer.apache.vhostConf |
459 | mypkgs.ympd.apache.vhostConf | 462 | mypkgs.ympd.apache.vhostConf |
460 | mypkgs.ttrss.apache.vhostConf | 463 | mypkgs.ttrss.apache.vhostConf |
464 | mypkgs.roundcubemail.apache.vhostConf | ||
461 | ]; | 465 | ]; |
462 | }) | 466 | }) |
463 | (withConf "eldiron" // { | 467 | (withConf "eldiron" // { |