diff --git a/config/users.nix b/config/users.nix index 455852c..bf62d6d 100644 --- a/config/users.nix +++ b/config/users.nix @@ -46,6 +46,5 @@ firefly-iii = uidGid 965; firefly-pico = uidGid 964; avahi = uidGid 963; - firefly-iii-data-importer = uidGid 962; }; } diff --git a/hosts/sentinel/firezone.nix b/hosts/sentinel/firezone.nix index 32f6abb..674b72f 100644 --- a/hosts/sentinel/firezone.nix +++ b/hosts/sentinel/firezone.nix @@ -14,7 +14,6 @@ let globals.services.grafana.domain globals.services.firefly.domain globals.services.firefly-pico.domain - globals.services.firefly-data-importer.domain globals.services.immich.domain globals.services.influxdb.domain globals.services.loki.domain diff --git a/hosts/ward/default.nix b/hosts/ward/default.nix index bf19d63..f69e832 100644 --- a/hosts/ward/default.nix +++ b/hosts/ward/default.nix @@ -15,7 +15,6 @@ let globals.services.grafana.domain globals.services.firefly.domain globals.services.firefly-pico.domain - globals.services.firefly-data-importer.domain globals.services.immich.domain globals.services.influxdb.domain globals.services.loki.domain diff --git a/hosts/ward/guests/adguardhome.nix b/hosts/ward/guests/adguardhome.nix index a152511..fe00c8b 100644 --- a/hosts/ward/guests/adguardhome.nix +++ b/hosts/ward/guests/adguardhome.nix @@ -114,7 +114,6 @@ in globals.services.grafana.domain globals.services.firefly.domain globals.services.firefly-pico.domain - globals.services.firefly-data-importer.domain globals.services.immich.domain globals.services.influxdb.domain globals.services.loki.domain diff --git a/hosts/ward/guests/firefly.nix b/hosts/ward/guests/firefly.nix index 9443d7b..ab43289 100644 --- a/hosts/ward/guests/firefly.nix +++ b/hosts/ward/guests/firefly.nix @@ -7,7 +7,6 @@ let fireflyDomain = "firefly.${globals.domains.me}"; fireflyPicoDomain = "firefly-pico.${globals.domains.me}"; - fireflyDataImporterDomain = "firefly-data-importer.${globals.domains.me}"; wardWebProxyCfg = nodes.ward-web-proxy.config; in { @@ -18,7 +17,6 @@ in globals.services.firefly.domain = fireflyDomain; globals.services.firefly-pico.domain = fireflyPicoDomain; - globals.services.firefly-data-importer.domain = fireflyDataImporterDomain; globals.monitoring.http.firefly = { url = "https://${fireflyDomain}"; expectedBodyRegex = "Firefly III"; @@ -44,13 +42,6 @@ in 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 = [ { directory = "/var/lib/firefly-iii"; @@ -60,10 +51,6 @@ in directory = "/var/lib/firefly-pico"; user = "firefly-pico"; } - { - directory = "/var/lib/firefly-iii-data-importer"; - user = "firefly-iii-data-importer"; - } ]; 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 = '' log_format json_combined escape=json '{' '"time": $msec,'