clan/clan-infra
10
0
Fork 2
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge pull request 'web01: use clan flake-parts module' (#216) from Mic92-main into main
All checks were successful
buildbot/nix-build .#checks.x86_64-linux.clan-merge Build done.
Details
buildbot/nix-build .#checks.x86_64-linux.devShell-clan-merge Build done.
Details
buildbot/nix-build .#checks.x86_64-linux.devShell-matrix-bot Build done.
Details
buildbot/nix-build .#checks.x86_64-linux.devShell-default Build done.
Details
buildbot/nix-build .#checks.x86_64-linux.package-action-ensure-tea-login Build done.
Details
buildbot/nix-build .#checks.x86_64-linux.package-action-flake-update Build done.
Details
buildbot/nix-build .#checks.x86_64-linux.package-action-flake-update-pr-clan Build done.
Details
buildbot/nix-build .#checks.x86_64-linux.package-clan-merge Build done.
Details
buildbot/nix-build .#checks.x86_64-linux.package-gitea Build done.
Details
buildbot/nix-build .#checks.x86_64-linux.package-job-flake-update-clan-homepage Build done.
Details
buildbot/nix-build .#checks.x86_64-linux.package-job-flake-update-clan-infra Build done.
Details
buildbot/nix-build .#checks.x86_64-linux.package-job-flake-update-data-mesher Build done.
Details
buildbot/nix-build .#checks.x86_64-linux.package-matrix-bot Build done.
Details
buildbot/nix-build .#checks.x86_64-linux.package-job-flake-update-clan-core Build done.
Details
buildbot/nix-build .#checks.x86_64-linux.treefmt Build done.
Details
buildbot/nix-build .#checks.x86_64-linux.package-action-create-pr Build done.
Details
buildbot/nix-build .#checks.x86_64-linux.nixos-web01 Build done.
Details
buildbot/nix-eval Build done.
Details

Browse Source
This commit is contained in:
clan-bot 2024-07-15 12:14:34 +00:00
commit 56e464a83a
8 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
devShells/flake-module.nix
View File

@ -1,6 +1,11 @@
{
perSystem =
{ inputs', pkgs, ... }:
{
config,
inputs',
pkgs,
...
}:
let
convert2Tofu =
provider:
@ -16,8 +21,15 @@
pkgs.bashInteractive
pkgs.sops
pkgs.nixVersions.latest
inputs'.clan-core.packages.tea-create-pr
inputs'.clan-core.packages.merge-after-ci
inputs'.clan-core.packages.clan-cli
# treefmt with config defined in ./flake.nix
config.treefmt.build.wrapper
(pkgs.opentofu.withPlugins (
p:
builtins.map convert2Tofu [
@ -29,7 +41,6 @@
]
))
];
inputsFrom = [ inputs'.clan-core.devShells.default ];
};
};
}

1
flake.nix
View File

@ -47,6 +47,7 @@
"aarch64-linux"
];
imports = [
inputs.clan-core.flakeModules.default
inputs.treefmt-nix.flakeModule
./devShells/flake-module.nix
./targets/flake-module.nix

2
modules/web01/clan-merge.nix
View File

@ -22,7 +22,7 @@
while sleep 10; do
${self.packages.${pkgs.system}.clan-merge}/bin/clan-merge \
--bot-name clan-bot \
--repos clan-infra clan-core clan-homepage
--repos clan-infra clan-core clan-homepage data-mesher
done
'';
};

1
modules/web01/jobs.nix
View File

@ -57,6 +57,7 @@ in
"job-flake-update-clan-core"
"job-flake-update-clan-homepage"
"job-flake-update-clan-infra"
"job-flake-update-data-mesher"
]
);
}

1
pkgs/flake-module.nix
View File

@ -34,6 +34,7 @@
job-flake-update-clan-core
job-flake-update-clan-homepage
job-flake-update-clan-infra
job-flake-update-data-mesher
;
};
};

1
pkgs/job-flake-updates/default.nix
View File

@ -13,4 +13,5 @@ in
job-flake-update-clan-core = job-flake-update "clan-core";
job-flake-update-clan-homepage = job-flake-update "clan-homepage";
job-flake-update-clan-infra = job-flake-update "clan-infra";
job-flake-update-data-mesher = job-flake-update "data-mesher";
}

10
targets/flake-module.nix
View File

@ -1,16 +1,14 @@
{ self, inputs, ... }:
{
flake = inputs.clan-core.lib.buildClan {
clan = {
meta.name = "infra";
directory = self;
# Make flake available in modules
specialArgs.self = {
inherit (self) inputs nixosModules packages;
};
machines = {
web01 = {
imports = [ (./web01/configuration.nix) ];
};
directory = self;
machines.web01 = {
imports = [ ./web01/configuration.nix ];
};
};
}

2
targets/web01/configuration.nix
View File

@ -7,7 +7,7 @@
networking.hostName = "web01";
systemd.network.networks."10-uplink".networkConfig.Address = "2a01:4f9:3080:418b::1";
clan.networking.targetHost = "root@clan.lol";
clan.core.networking.targetHost = "root@clan.lol";
clan-infra.networking.ipv4.address = "65.21.12.51";
clan-infra.networking.ipv4.gateway = "65.21.12.1";
clan-infra.networking.ipv6.address =