From 21c97e1f4121de3de5d906ee2c5663c79d31c9ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 17 Jun 2024 15:05:05 +0200 Subject: [PATCH] rename clanCore -> clan.core --- flake.lock | 10 +++++----- flake.nix | 2 +- modules/mailserver.nix | 8 ++++---- modules/web01/borgbackup.nix | 4 ++-- modules/web01/gitea/default.nix | 2 +- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/flake.lock b/flake.lock index b6b64e0..e2ea24f 100644 --- a/flake.lock +++ b/flake.lock @@ -59,15 +59,15 @@ ] }, "locked": { - "lastModified": 1718611779, - "narHash": "sha256-ZohxTXp0ZABO3YBfeq357tI39YBAiMZVY0XofEa4PZI=", - "rev": "1cd606b879516454b2a58633ccc8adacce6b5520", + "lastModified": 1718812851, + "narHash": "sha256-iEpESD8Hywek3lkGgvTjG5C25UTaAAjnqX9R0lIvhSI=", + "rev": "20b952b4cd82f1822efbe33e89a923d0eeb9d393", "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/20b952b4cd82f1822efbe33e89a923d0eeb9d393.tar.gz" }, "original": { "type": "tarball", - "url": "https://git.clan.lol/clan/clan-core/archive/main.tar.gz" + "url": "https://git.clan.lol/clan/clan-core/archive/refactor-state.tar.gz" } }, "disko": { diff --git a/flake.nix b/flake.nix index 6f556a8..acb0d98 100644 --- a/flake.nix +++ b/flake.nix @@ -26,7 +26,7 @@ # Use the version of nixpkgs that has been tested to work with SrvOS srvos.inputs.nixpkgs.follows = "nixpkgs"; - clan-core.url = "https://git.clan.lol/clan/clan-core/archive/main.tar.gz"; + clan-core.url = "https://git.clan.lol/clan/clan-core/archive/refactor-state.tar.gz"; clan-core.inputs.flake-parts.follows = "flake-parts"; clan-core.inputs.nixpkgs.follows = "nixpkgs"; clan-core.inputs.treefmt-nix.follows = "treefmt-nix"; 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;