hydra-module: Run hydra-init during hydra-init.service

Signed-off-by: Shea Levy <shea@shealevy.com>
This commit is contained in:
Shea Levy 2013-03-22 13:22:00 -04:00
parent e4a8818bae
commit 7cb2c13c88

View file

@ -123,11 +123,10 @@ in
users.extraUsers.hydra = users.extraUsers.hydra =
{ description = "Hydra"; { description = "Hydra";
home = cfg.baseDir; home = baseDir;
createHome = true; createHome = true;
useDefaultShell = true; useDefaultShell = true;
} };
];
nix.extraOptions = '' nix.extraOptions = ''
gc-keep-outputs = true gc-keep-outputs = true
@ -149,14 +148,16 @@ in
use-sqlite-wal = ${if cfg.useWAL then "true" else "false"} use-sqlite-wal = ${if cfg.useWAL then "true" else "false"}
''; '';
jobs."hydra-init" = systemd.services."hydra-init" =
{ wantedBy = [ "multi-user.target" ]; { wantedBy = [ "multi-user.target" ];
environment = env;
script = '' script = ''
mkdir -p ${baseDir}/data mkdir -p ${baseDir}/data
chown hydra ${cfg.baseDir}/data chown hydra ${baseDir}/data
ln -sf ${hydraConf} ${cfg.baseDir}/data/hydra.conf ln -sf ${hydraConf} ${baseDir}/data/hydra.conf
${pkgs.shadow}/bin/su hydra -c ${cfg.hydra}/bin/hydra-init
''; '';
task = true; serviceConfig.Type = "oneshot";
}; };
systemd.services."hydra-server" = systemd.services."hydra-server" =
@ -229,8 +230,8 @@ in
find /nix/var/log/nix/drvs -type f -a ! -newer r -name '*.drv' | xargs bzip2 -v find /nix/var/log/nix/drvs -type f -a ! -newer r -name '*.drv' | xargs bzip2 -v
''; '';
in in
[ "*/5 * * * * root ${checkSpace} &> ${cfg.baseDir}/data/checkspace.log" [ "*/5 * * * * root ${checkSpace} &> ${baseDir}/data/checkspace.log"
"15 5 * * * root ${compressLogs} &> ${cfg.baseDir}/data/compress.log" "15 5 * * * root ${compressLogs} &> ${baseDir}/data/compress.log"
"15 2 * * * root ${pkgs.systemd}/bin/systemctl start hydra-update-gc-roots.service" "15 2 * * * root ${pkgs.systemd}/bin/systemctl start hydra-update-gc-roots.service"
]; ];
}; };