sercanto/infra
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

flake: drop domain

Browse source
This commit is contained in:
zowoq 2023-02-06 18:09:06 +10:00
parent e08836f51a
commit 0d290748d3
4 changed files with 6 additions and 16 deletions

2
build04/configuration.nix
View file

@ -36,5 +36,5 @@
# nix run github:numtide/nixos-anywhere#nixos-anywhere -- \ # nix run github:numtide/nixos-anywhere#nixos-anywhere -- \
# --debug \ # --debug \
# --kexec "$(nix build --print-out-paths github:nix-community/nixos-images#packages.aarch64-linux.kexec-installer-nixos-unstable)/nixos-kexec-installer-aarch64-linux.tar.gz" \ # --kexec "$(nix build --print-out-paths github:nix-community/nixos-images#packages.aarch64-linux.kexec-installer-nixos-unstable)/nixos-kexec-installer-aarch64-linux.tar.gz" \
# --flake '.#build04.nix-community.org' \ # --flake '.#build04' \
# opc@141.148.235.248 # opc@141.148.235.248

3
ci.nix
View file

@ -5,7 +5,6 @@
let let
self = builtins.getFlake (toString ./.); self = builtins.getFlake (toString ./.);
inherit (self.inputs.nixpkgs) lib; inherit (self.inputs.nixpkgs) lib;
stripDomain = name: lib.head (builtins.match "(.*).nix-community.org" name);
effects = self.inputs.hercules-ci-effects.lib.withPkgs self.inputs.nixpkgs.legacyPackages.x86_64-linux; effects = self.inputs.hercules-ci-effects.lib.withPkgs self.inputs.nixpkgs.legacyPackages.x86_64-linux;
terraform-deploy = terraform-deploy =
@ -32,7 +31,7 @@ let
''; '';
}); });
in in
(lib.mapAttrs' (name: config: lib.nameValuePair "nixos-${stripDomain name}" config.config.system.build.toplevel) self.outputs.nixosConfigurations) // (lib.mapAttrs' (name: config: lib.nameValuePair "nixos-${name}" config.config.system.build.toplevel) self.outputs.nixosConfigurations) //
{ {
# FIXME: maybe find a more generic solution here? # FIXME: maybe find a more generic solution here?
devShell-x86_64 = self.outputs.devShells.x86_64-linux.default; devShell-x86_64 = self.outputs.devShells.x86_64-linux.default;

8
flake.nix
View file

@ -77,7 +77,7 @@
]; ];
in in
{ {
"build01.nix-community.org" = nixosSystem { build01 = nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";
modules = modules =
common common
@ -87,7 +87,7 @@
]; ];
}; };
"build02.nix-community.org" = nixosSystem { build02 = nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";
modules = modules =
common common
@ -106,7 +106,7 @@
]; ];
}; };
"build03.nix-community.org" = nixosSystem { build03 = nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";
modules = modules =
common common
@ -120,7 +120,7 @@
]; ];
}; };
"build04.nix-community.org" = nixosSystem { build04 = nixosSystem {
system = "aarch64-linux"; system = "aarch64-linux";
modules = modules =
common common

9
roles/common.nix
View file

@ -1,5 +1,3 @@
{ lib, config, ... }:
{ {
imports = [ imports = [
./auto-upgrade.nix ./auto-upgrade.nix
@ -27,11 +25,4 @@
documentation.enable = false; documentation.enable = false;
networking.domain = "nix-community.org"; networking.domain = "nix-community.org";
# HACK: NixOS does not let us using a hostname that has the domain part included include domain part in hostname
boot.kernel.sysctl."kernel.hostname" = config.networking.fqdn;
# don't override host set by sysctl
system.activationScripts.hostname = lib.mkForce "";
system.activationScripts.domain = lib.mkForce "";
} }