lukegb/depot
1
0
Fork 0
Code Issues 1 Pull requests Projects Packages Activity Actions

fr24feed: try to bind /etc/fr24feed in instead

Browse source
This commit is contained in:
Luke Granger-Brown 2023-05-29 00:15:19 +01:00
parent 1c9b9e9fcd
commit f7f8691649
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
nix/pkgs/fr24feed/default.nix
View file

@ -1,7 +1,7 @@
{ stdenv { stdenv
, lib , lib
, fetchurl , fetchurl
, buildFHSUserEnv , buildFHSEnv
, bash , bash
, writeText , writeText
}: }:
@ -23,12 +23,16 @@ let
''; '';
}; };
in in
buildFHSUserEnv { buildFHSEnv {
name = "fr24feed"; name = "fr24feed";
targetPkgs = pkgs: with pkgs; [ targetPkgs = pkgs: with pkgs; [
bash bash
]; ];
extraBwrapArgs = [
"--ro-bind-try /etc/fr24feed /etc/fr24feed"
];
runScript = "${bash}/bin/bash ${ runScript = "${bash}/bin/bash ${
writeText "fr24feed" writeText "fr24feed"
'' ''

2
ops/nixos/totoro/adsb.nix
View file

@ -136,7 +136,7 @@
LogsDirectoryMode = "0755"; LogsDirectoryMode = "0755";
ConfigurationDirectory = "fr24feed"; ConfigurationDirectory = "fr24feed";
ConfigurationDirectoryMode = "0750"; ConfigurationDirectoryMode = "0750";
ExecStart = "${depot.nix.pkgs.fr24feed}/bin/fr24feed --config-file=/host/etc/fr24feed/fr24feed.ini"; ExecStart = "${depot.nix.pkgs.fr24feed}/bin/fr24feed --config-file=/etc/fr24feed/fr24feed.ini";
Restart = "on-failure"; Restart = "on-failure";
RestartSec = 30; RestartSec = 30;
TimeoutStopSec = 5; TimeoutStopSec = 5;