test-nixos-pelican #138

Open
silver wants to merge 5 commits from test-nixos-pelican into main
2 changed files with 39 additions and 23 deletions
Showing only changes of commit 58787628d2 - Show all commits

View file

@ -1,5 +1,10 @@
{ inputs, pkgs, lib, config, ... }:
{
inputs,
pkgs,
lib,
config,
...
}:
with lib; let
cfg = config.modules.pelican-panel;
dir = "/var/www/pelican";
@ -26,12 +31,18 @@ in {
pkgs.php83Extensions.zip
pkgs.php83Extensions.intl
pkgs.php83Extensions.sqlite3
( import ./pelican-install.nix { inherit pkgs; inherit dir; } )
( import ./pelican-update.nix { inherit pkgs; inherit dir; } )
(import ./pelican-install.nix {
inherit pkgs;
inherit dir;
})
(import ./pelican-update.nix {
inherit pkgs;
inherit dir;
})
];
systemd.timers."pelican-cron" = {
wantedBy = [ "timers.target" ];
wantedBy = ["timers.target"];
timerConfig = {
OnBootSec = "5m";
OnUnitActiveSec = "1m";
@ -49,15 +60,15 @@ in {
};
systemd.services.pelican-queue = {
wantedBy = [ "multi-user.target" ];
wantedBy = ["multi-user.target"];
serviceConfig = {
User = "nginx";
Group = "nginx";
Restart = "always";
ExecStart = "${pkgs.php83}/bin/php ${dir}/artisan queue:work --tries=3";
startLimitInterval = 180;
startLimitBurst = 30;
RestartSec = "5";
User = "nginx";
Group = "nginx";
Restart = "always";
ExecStart = "${pkgs.php83}/bin/php ${dir}/artisan queue:work --tries=3";
startLimitInterval = 180;
startLimitBurst = 30;
RestartSec = "5";
};
};
};

View file

@ -1,5 +1,10 @@
{ inputs, pkgs, lib, config, ... }:
{
inputs,
pkgs,
lib,
config,
...
}:
with lib; let
cfg = config.modules.pelican-wings;
in {
@ -10,19 +15,19 @@ in {
};
config = mkIf cfg.enable {
networking.firewall.allowedTCPPorts = [ 8080 8443 ];
networking.firewall.allowedTCPPorts = [8080 8443];
virtualisation.docker.enable = true;
environment.systemPackages = [
( pkgs.callPackage ./package.nix {} )
(pkgs.callPackage ./package.nix {})
];
systemd.services.pelican-wings = {
description = "Wings Daemon";
after = [ "docker.service" ];
requires = [ "docker.service" ];
partOf = [ "docker.service" ];
after = ["docker.service"];
requires = ["docker.service"];
partOf = ["docker.service"];
serviceConfig = {
User = "root";
@ -36,7 +41,7 @@ in {
RestartSec = "5";
};
wantedBy = [ "multi-user.target" ];
wantedBy = ["multi-user.target"];
};
};
}