diff options
Diffstat (limited to 'virtual/eldiron.nix')
-rw-r--r-- | virtual/eldiron.nix | 22 |
1 files changed, 21 insertions, 1 deletions
diff --git a/virtual/eldiron.nix b/virtual/eldiron.nix index 6237e06..2152aff 100644 --- a/virtual/eldiron.nix +++ b/virtual/eldiron.nix | |||
@@ -8,7 +8,7 @@ | |||
8 | with import ../libs.nix; | 8 | with import ../libs.nix; |
9 | let | 9 | let |
10 | mypkgs = pkgs.callPackage ./packages.nix { | 10 | mypkgs = pkgs.callPackage ./packages.nix { |
11 | inherit checkEnv fetchedGitPrivate fetchedGithub; | 11 | inherit checkEnv fetchedGit fetchedGitPrivate fetchedGithub; |
12 | }; | 12 | }; |
13 | in | 13 | in |
14 | { | 14 | { |
@@ -255,6 +255,7 @@ | |||
255 | aten_prod = mypkgs.aten_prod.phpFpm.pool; | 255 | aten_prod = mypkgs.aten_prod.phpFpm.pool; |
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 | }; | 259 | }; |
259 | }; | 260 | }; |
260 | 261 | ||
@@ -270,11 +271,13 @@ | |||
270 | aten_dev = mypkgs.aten_dev.activationScript; | 271 | aten_dev = mypkgs.aten_dev.activationScript; |
271 | aten_prod = mypkgs.aten_prod.activationScript; | 272 | aten_prod = mypkgs.aten_prod.activationScript; |
272 | nextcloud = mypkgs.nextcloud.activationScript; | 273 | nextcloud = mypkgs.nextcloud.activationScript; |
274 | ttrss = mypkgs.ttrss.activationScript; | ||
273 | httpd = '' | 275 | httpd = '' |
274 | install -d -m 0755 /var/lib/acme/acme-challenge | 276 | install -d -m 0755 /var/lib/acme/acme-challenge |
275 | install -d -m 0750 -o wwwrun -g wwwrun /var/lib/php/sessions | 277 | install -d -m 0750 -o wwwrun -g wwwrun /var/lib/php/sessions |
276 | install -d -m 0750 -o wwwrun -g wwwrun /var/lib/php/sessions/adminer | 278 | install -d -m 0750 -o wwwrun -g wwwrun /var/lib/php/sessions/adminer |
277 | install -d -m 0750 -o wwwrun -g wwwrun /var/lib/php/sessions/mantisbt | 279 | install -d -m 0750 -o wwwrun -g wwwrun /var/lib/php/sessions/mantisbt |
280 | install -d -m 0750 -o wwwrun -g wwwrun /var/lib/php/sessions/ttrss | ||
278 | ''; | 281 | ''; |
279 | redis = '' | 282 | redis = '' |
280 | mkdir -p /run/redis | 283 | mkdir -p /run/redis |
@@ -428,6 +431,7 @@ | |||
428 | mypkgs.ympd.apache.modules ++ | 431 | mypkgs.ympd.apache.modules ++ |
429 | mypkgs.git.web.apache.modules ++ | 432 | mypkgs.git.web.apache.modules ++ |
430 | mypkgs.mantisbt.apache.modules ++ | 433 | mypkgs.mantisbt.apache.modules ++ |
434 | mypkgs.ttrss.apache.modules ++ | ||
431 | pkgs.lib.lists.flatten (pkgs.lib.attrsets.mapAttrsToList (n: v: v.modules) apacheConfig) ++ | 435 | pkgs.lib.lists.flatten (pkgs.lib.attrsets.mapAttrsToList (n: v: v.modules) apacheConfig) ++ |
432 | [ "macro" ]); | 436 | [ "macro" ]); |
433 | extraConfig = builtins.concatStringsSep "\n" | 437 | extraConfig = builtins.concatStringsSep "\n" |
@@ -453,6 +457,7 @@ | |||
453 | extraConfig = builtins.concatStringsSep "\n" [ | 457 | extraConfig = builtins.concatStringsSep "\n" [ |
454 | mypkgs.adminer.apache.vhostConf | 458 | mypkgs.adminer.apache.vhostConf |
455 | mypkgs.ympd.apache.vhostConf | 459 | mypkgs.ympd.apache.vhostConf |
460 | mypkgs.ttrss.apache.vhostConf | ||
456 | ]; | 461 | ]; |
457 | }) | 462 | }) |
458 | (withConf "eldiron" // { | 463 | (withConf "eldiron" // { |
@@ -652,5 +657,20 @@ | |||
652 | "5 0 * * * root ${stats "osteopathe-cc.fr" ./packages/chloe_goaccess.conf}" | 657 | "5 0 * * * root ${stats "osteopathe-cc.fr" ./packages/chloe_goaccess.conf}" |
653 | ]; | 658 | ]; |
654 | }; | 659 | }; |
660 | |||
661 | systemd.services.tt-rss = { | ||
662 | description = "Tiny Tiny RSS feeds update daemon"; | ||
663 | serviceConfig = { | ||
664 | User = "wwwrun"; | ||
665 | ExecStart = "${pkgs.php}/bin/php ${mypkgs.ttrss.webRoot}/update.php --daemon"; | ||
666 | StandardOutput = "syslog"; | ||
667 | StandardError = "syslog"; | ||
668 | PermissionsStartOnly = true; | ||
669 | }; | ||
670 | |||
671 | wantedBy = [ "multi-user.target" ]; | ||
672 | requires = ["postgresql.service"]; | ||
673 | after = ["network.target" "postgresql.service"]; | ||
674 | }; | ||
655 | }; | 675 | }; |
656 | } | 676 | } |