diff --git a/flake.lock b/flake.lock index b6b64e0..05cdcf7 100644 --- a/flake.lock +++ b/flake.lock @@ -59,11 +59,11 @@ ] }, "locked": { - "lastModified": 1718611779, - "narHash": "sha256-ZohxTXp0ZABO3YBfeq357tI39YBAiMZVY0XofEa4PZI=", - "rev": "1cd606b879516454b2a58633ccc8adacce6b5520", + "lastModified": 1718900431, + "narHash": "sha256-iEpESD8Hywek3lkGgvTjG5C25UTaAAjnqX9R0lIvhSI=", + "rev": "b3123b150ff7a287d36efd1cce29bd4d1e7e4d86", "type": "tarball", - "url": "https://git.clan.lol/api/v1/repos/clan/clan-core/archive/1cd606b879516454b2a58633ccc8adacce6b5520.tar.gz" + "url": "https://git.clan.lol/api/v1/repos/clan/clan-core/archive/b3123b150ff7a287d36efd1cce29bd4d1e7e4d86.tar.gz" }, "original": { "type": "tarball", diff --git a/modules/mailserver.nix b/modules/mailserver.nix index 86d41ca..b1f5f74 100644 --- a/modules/mailserver.nix +++ b/modules/mailserver.nix @@ -27,9 +27,9 @@ in localDnsResolver = false; loginAccounts."golem@clan.lol".hashedPasswordFile = - config.clanCore.facts.services.golem-mail.secret.golem-password-hash.path; + config.clan.core.facts.services.golem-mail.secret.golem-password-hash.path; loginAccounts."gitea@clan.lol".hashedPasswordFile = - config.clanCore.facts.services.gitea-mail.secret.gitea-password-hash.path; + config.clan.core.facts.services.gitea-mail.secret.gitea-password-hash.path; }; services.unbound = { @@ -49,6 +49,6 @@ in security.acme.acceptTerms = true; - clanCore.facts.services.golem-mail = mailPassword { service = "golem"; }; - clanCore.facts.services.gitea-mail = mailPassword { service = "gitea"; }; + clan.core.facts.services.golem-mail = mailPassword { service = "golem"; }; + clan.core.facts.services.gitea-mail = mailPassword { service = "gitea"; }; } diff --git a/modules/web01/borgbackup.nix b/modules/web01/borgbackup.nix index 8c3d37d..2bd1037 100644 --- a/modules/web01/borgbackup.nix +++ b/modules/web01/borgbackup.nix @@ -5,10 +5,10 @@ # 100GB storagebox is under the nix-community hetzner account clan.borgbackup.destinations.${config.networking.hostName} = { repo = "u366395@u366395.your-storagebox.de:/./borgbackup"; - rsh = "ssh -oPort=23 -i ${config.clanCore.facts.services.borgbackup.secret."borgbackup.ssh".path}"; + rsh = "ssh -oPort=23 -i ${config.clan.core.facts.services.borgbackup.secret."borgbackup.ssh".path}"; }; - clanCore.state.system.folders = [ + clan.core.state.system.folders = [ "/home" "/etc" "/var" diff --git a/modules/web01/gitea/default.nix b/modules/web01/gitea/default.nix index 080745c..d9a3048 100644 --- a/modules/web01/gitea/default.nix +++ b/modules/web01/gitea/default.nix @@ -38,7 +38,7 @@ in settings.actions.ENABLED = true; - mailerPasswordFile = config.clanCore.facts.services.gitea-mail.secret.gitea-password.path; + mailerPasswordFile = config.clan.core.facts.services.gitea-mail.secret.gitea-password.path; settings.mailer = { ENABLED = true;