sokai/mynixos-config
1
1
Fork 0
forked from mirrors_public/oddlama_nix-config
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat: remove firefly-iii-data-importer (import errors, no easy multi-user automatic pulls, cluttered data format)

Browse source
This commit is contained in:
oddlama 2025-04-28 17:31:01 +02:00
parent 2d86a1b0bd
commit 7dcbcd75bc
No known key found for this signature in database
GPG key ID: 14EFE510775FE39A
5 changed files with 0 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

1
config/users.nix
View file

@ -46,6 +46,5 @@
firefly-iii = uidGid 965; firefly-iii = uidGid 965;
firefly-pico = uidGid 964; firefly-pico = uidGid 964;
avahi = uidGid 963; avahi = uidGid 963;
firefly-iii-data-importer = uidGid 962;
}; };
} }

1
hosts/sentinel/firezone.nix
View file

@ -14,7 +14,6 @@ let
globals.services.grafana.domain globals.services.grafana.domain
globals.services.firefly.domain globals.services.firefly.domain
globals.services.firefly-pico.domain globals.services.firefly-pico.domain
globals.services.firefly-data-importer.domain
globals.services.immich.domain globals.services.immich.domain
globals.services.influxdb.domain globals.services.influxdb.domain
globals.services.loki.domain globals.services.loki.domain

1
hosts/ward/default.nix
View file

@ -15,7 +15,6 @@ let
globals.services.grafana.domain globals.services.grafana.domain
globals.services.firefly.domain globals.services.firefly.domain
globals.services.firefly-pico.domain globals.services.firefly-pico.domain
globals.services.firefly-data-importer.domain
globals.services.immich.domain globals.services.immich.domain
globals.services.influxdb.domain globals.services.influxdb.domain
globals.services.loki.domain globals.services.loki.domain

1
hosts/ward/guests/adguardhome.nix
View file

@ -114,7 +114,6 @@ in
globals.services.grafana.domain globals.services.grafana.domain
globals.services.firefly.domain globals.services.firefly.domain
globals.services.firefly-pico.domain globals.services.firefly-pico.domain
globals.services.firefly-data-importer.domain
globals.services.immich.domain globals.services.immich.domain
globals.services.influxdb.domain globals.services.influxdb.domain
globals.services.loki.domain globals.services.loki.domain

30
hosts/ward/guests/firefly.nix
View file

@ -7,7 +7,6 @@
let let
fireflyDomain = "firefly.${globals.domains.me}"; fireflyDomain = "firefly.${globals.domains.me}";
fireflyPicoDomain = "firefly-pico.${globals.domains.me}"; fireflyPicoDomain = "firefly-pico.${globals.domains.me}";
fireflyDataImporterDomain = "firefly-data-importer.${globals.domains.me}";
wardWebProxyCfg = nodes.ward-web-proxy.config; wardWebProxyCfg = nodes.ward-web-proxy.config;
in in
{ {
@ -18,7 +17,6 @@ in
globals.services.firefly.domain = fireflyDomain; globals.services.firefly.domain = fireflyDomain;
globals.services.firefly-pico.domain = fireflyPicoDomain; globals.services.firefly-pico.domain = fireflyPicoDomain;
globals.services.firefly-data-importer.domain = fireflyDataImporterDomain;
globals.monitoring.http.firefly = { globals.monitoring.http.firefly = {
url = "https://${fireflyDomain}"; url = "https://${fireflyDomain}";
expectedBodyRegex = "Firefly III"; expectedBodyRegex = "Firefly III";
@ -44,13 +42,6 @@ in
owner = "firefly-pico"; owner = "firefly-pico";
}; };
age.secrets.firefly-data-importer-app-key = {
generator.script = _: ''
echo "base64:$(head -c 32 /dev/urandom | base64)"
'';
owner = "firefly-data-importer";
};
environment.persistence."/persist".directories = [ environment.persistence."/persist".directories = [
{ {
directory = "/var/lib/firefly-iii"; directory = "/var/lib/firefly-iii";
@ -60,10 +51,6 @@ in
directory = "/var/lib/firefly-pico"; directory = "/var/lib/firefly-pico";
user = "firefly-pico"; user = "firefly-pico";
} }
{
directory = "/var/lib/firefly-iii-data-importer";
user = "firefly-iii-data-importer";
}
]; ];
networking.hosts.${wardWebProxyCfg.wireguard.proxy-home.ipv4} = [ networking.hosts.${wardWebProxyCfg.wireguard.proxy-home.ipv4} = [
@ -102,23 +89,6 @@ in
}; };
}; };
services.firefly-iii-data-importer = {
enable = true;
enableNginx = true;
virtualHost = globals.services.firefly-data-importer.domain;
settings = {
LOG_CHANNEL = "syslog";
APP_ENV = "local";
APP_URL = "https://${globals.services.firefly-data-importer.domain}";
TZ = "Europe/Berlin";
FIREFLY_III_URL = config.services.firefly-iii.settings.APP_URL;
VANITY_URL = config.services.firefly-iii.settings.APP_URL;
TRUSTED_PROXIES = wardWebProxyCfg.wireguard.proxy-home.ipv4;
EXPECT_SECURE_URL = "true";
APP_KEY_FILE = config.age.secrets.firefly-data-importer-app-key.path;
};
};
services.nginx.commonHttpConfig = '' services.nginx.commonHttpConfig = ''
log_format json_combined escape=json '{' log_format json_combined escape=json '{'
'"time": $msec,' '"time": $msec,'