felschr/nixos-config
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(owntracks): add secret to owntracks-recorder

Browse source 
And fix `secrets/mqtt/owntracks.age`.
This commit is contained in:
Felix Schröter 2022-05-30 01:43:22 +02:00
parent 6efc9cea3f
commit 62bc964785
Signed by: felschr
GPG key ID: 671E39E6744C807D
6 changed files with 19 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

1
services/mosquitto.nix
View file

@ -17,7 +17,6 @@ in {
mqtt-hass = mkSecret ../secrets/mqtt/hass.age;
mqtt-tasmota = mkSecret ../secrets/mqtt/tasmota.age;
mqtt-owntracks = mkSecret ../secrets/mqtt/owntracks.age;
mqtt-owntracks-plain = mkSecret ../secrets/mqtt/owntracks-plain.age;
};
services.nginx = {

11
services/owntracks.nix
View file

@ -6,6 +6,8 @@ let
window.owntracks.config = {};
'';
in {
age.secrets.owntracks-recorder-env.file =
../secrets/owntracks/recorder.env.age;
age.secrets.owntracks-htpasswd.file = ../secrets/owntracks/htpasswd.age;
virtualisation.oci-containers.containers = {
@ -18,18 +20,15 @@ in {
OTR_HOST = "localhost";
OTR_PORT = "1883";
OTR_USER = "owntracks";
OTR_PASS = ""; # TODO
};
# provide OTR_PASS
environmentFiles = [ config.age.secrets.owntracks-recorder-env.path ];
# easypi/ot-recorder-arm uses different store location
# volumes = [ "/var/lib/owntracks/recorder/store:/store" ];
volumes = [
"/var/lib/owntracks/recorder/store:/var/spool/owntracks/recorder/store"
];
extraOptions = [
# TODO systemd doesn't substitute variables because it doesn't run in a shell
# "-e OTR_PASS=\"$(cat ${config.age.secrets.mqtt-owntracks-plain.path})\""
"--network=host"
];
extraOptions = [ "--network=host" ];
};
owntracks-frontend = {