diff --git a/modules/config/instances/config/firefly.nix b/modules/config/instances/config/firefly-iii.nix similarity index 83% rename from modules/config/instances/config/firefly.nix rename to modules/config/instances/config/firefly-iii.nix index 0574b51..7096967 100644 --- a/modules/config/instances/config/firefly.nix +++ b/modules/config/instances/config/firefly-iii.nix @@ -6,8 +6,8 @@ let sslPath sopsPath ; - label = "Firefly"; - name = "firefly"; + label = "Firefly-III"; + name = "firefly-iii"; domain = "${name}.${domain0}"; in { @@ -25,10 +25,9 @@ in subdomain = name; paths = { path0 = "${servicePath}/${label}"; - path1 = "${servicePath}/${label}/cache"; }; ports = { - port0 = 3000; + port0 = 8080; }; ssl = { cert = "${sslPath}/${name}.${domain0}/fullchain.pem"; diff --git a/modules/nixos/services/firefly/default.nix b/modules/nixos/services/firefly-iii/default.nix similarity index 91% rename from modules/nixos/services/firefly/default.nix rename to modules/nixos/services/firefly-iii/default.nix index 42d2703..1a9320d 100755 --- a/modules/nixos/services/firefly/default.nix +++ b/modules/nixos/services/firefly-iii/default.nix @@ -1,8 +1,8 @@ { flake, config, ... }: let - inherit (flake.config.services.instances) firefly; + inherit (flake.config.services.instances) firefly-iii; inherit (flake.config.machines.devices) ceres; - service = firefly; + service = firefly-iii; in { services = { @@ -22,7 +22,7 @@ in let sopsPath = secret: { path = "${service.sops.path0}/${service.name}-${secret}"; - owner = "firefly-iii"; + owner = service.name; mode = "600"; }; in diff --git a/secrets/secrets.yaml b/secrets/secrets.yaml index c1e3b9f..3fc750c 100755 --- a/secrets/secrets.yaml +++ b/secrets/secrets.yaml @@ -50,7 +50,7 @@ caddy: prompter-auth: ENC[AES256_GCM,data:uEj6gruCfcIRoCQY9eNcOka+PAIIhAlKnI+ehZ88aZo90tINcxZ7ZvKqlTJr4rt5o+EO7rvRJcYH/s8/+piszFyxSa64Rtq5KdAjfHnRm0QM8q/2JIHnZsQC3fPz1S177WPs/c3Eydh4VeVe,iv:ZOru4ABFgIy9DoTlMl3InSf8zM1ERNpbRNLN6vy97Jc=,tag:5v3w7kvFQCEPBjchE8K0cw==,type:str] comfyui-auth: ENC[AES256_GCM,data:YkHxbW/0zTmnrggXKl2jNO4OnBaepmCwB3ZC6d8MPIKf8snWJzAvTq5+X5ABzziwKaypHRTcS6vuNntxKrrD8DS7hX9DqVCZc5WeFHI6S5VzHh3SprW2MF4E8nm4Hj+VHoKGmRSSOU1cfX3J,iv:v0Pid0BCY2QsMNaahBvJd4WWZD115JDLHlOCQvPiaGU=,tag:gpsAgt052NoOyIa9WqJXyg==,type:str] wifi-home: ENC[AES256_GCM,data:5NYSCUyalDf7gZF7WaRQJCo=,iv:RkVZKsmVEBg5M28DSkBD41673iLM+dqDAAhSwjqejck=,tag:QQ17VSWOnU0bGglZq6455Q==,type:str] -firefly-pass: ENC[AES256_GCM,data:/VOknfdSYC5Jb3l3rAgzaPbz7/onuKQFMXqLgnHlsFV34kIVui49WCujPcs=,iv:BMGcCo+kVJNU5LnEs9J36W0KmVQG3SXnuBVRsnXAhtM=,tag:ksz8d7aAM297a1270FiF3A==,type:str] +firefly-iii-pass: ENC[AES256_GCM,data:VqKhy/2bnlQwTcJDzCjmYjPgyb2irCcTMotcomkpYhEIBADqPQ2v/PJidfg=,iv:TeRdODaXSAq+7WC0wkpezmmN6o/0+hmral2N6OgSMv8=,tag:Y4N4lRTrKAnoar2kvs4cow==,type:str] sops: age: - recipient: age19dpncsdphdt2tmknjs99eghk527pvdrw0m29qjn2z2gg3et5tdtqycqhl0 @@ -62,7 +62,7 @@ sops: bXBOa1VSakoyaWxpODJEOU11QUZCaUEK8Ch9Ten3DdrPHF1DTH2qei85AlHUOaLD aNfzakake7ej+MxJYdKEU0bcWofNMKzIlZa2uM10KZSENDP8d8qlig== -----END AGE ENCRYPTED FILE----- - lastmodified: "2025-10-09T08:05:45Z" - mac: ENC[AES256_GCM,data:NI8LDAk3WfECb9Fa3K7+XkI6gvn6pG9SooaGlsECN86gNvQtmcAEMzUDQXuifBUA/EtT9MJTqWKtUjayoset8hTWIUFyfT6sl4YrICnia9GqvzJqsuN6zw6AgDKD/1pJALdZEZAqgoKtUQi3Vax9ICaLKCUeMdX6w3KcbqJOPW8=,iv:KKtblTvTfi6iA2KHRqBHyEhYfTmd1cVkp+LL/f/AbhE=,tag:FgOLIdFvLjJQLxdMS2xZwg==,type:str] + lastmodified: "2025-10-09T08:27:53Z" + mac: ENC[AES256_GCM,data:O5j40991L8/u/2WACF4w80xbbuozaI2z67Nmu4gVk8Y8VUafp3/tvqW6f9tJKZSC/GT6Qs7uX5vg68u8XFP2qmvwoNjHvhwN3V6K/axUx7wbxFKV7LKtOBCfmE1HJ8JtAUdV584zmBY0HyO0MLnFxjr5eEZe1GH2XaftRujG2MI=,iv:GxID1HP7s6sJh4PYzPuIcGSsi+g/hRTyRmsrO+Qm9MY=,tag:Mtk6xHncCsYJTd3lLFYJUA==,type:str] unencrypted_suffix: _unencrypted version: 3.11.0